diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-09-05 11:24:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-09-05 11:24:58 +0000 |
commit | f498e7f3c05f1d7df34251a2c16d870f7d12d521 (patch) | |
tree | dba95c29ae09c77dfde62acaa66753d70ee5da5f /overcloud-without-mergepy.yaml | |
parent | 24f4146cbb2959c849a3396c36e7e89ae6334843 (diff) | |
parent | bc9368fd91ca29b5c86caa3ddc88d8ff76009250 (diff) |
Merge "Support for using external Ceph clusters"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index cdfe61df..fcc7cc80 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -46,6 +46,14 @@ parameters: default: false description: Whether to enable or not the NFS backend for Cinder type: boolean + CephClientKey: + default: '' + description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring. + type: string + CephExternalMonHost: + default: '' + type: string + description: List of externally managed Ceph Mon Host IPs. Only used for external Ceph deployments. CinderEnableIscsiBackend: default: true description: Whether to enable or not the Iscsi backend for Cinder @@ -1182,9 +1190,12 @@ resources: CephClusterConfig: type: OS::TripleO::CephClusterConfig::SoftwareConfig properties: + ceph_storage_count: {get_param: CephStorageCount} ceph_fsid: {get_param: CephClusterFSID} ceph_mon_key: {get_param: CephMonKey} ceph_admin_key: {get_param: CephAdminKey} + ceph_client_key: {get_param: CephClientKey} + ceph_external_mon_ips: {get_param: CephExternalMonHost} ceph_mon_names: {get_attr: [Controller, hostname]} ceph_mon_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]} |