diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-10 21:35:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-10 21:35:50 +0000 |
| commit | ddf66ed256fcc6b2a5a09ae1f7646df6435b4eb4 (patch) | |
| tree | 02b5e1cdd3c8f3d1d02d9eadade61912166612cb /puppet/ceph-cluster-config.yaml | |
| parent | 164fcec5b5f1893d67111099125fe05b3d712623 (diff) | |
| parent | 99cdabc403e5e9ff66182526ff6c577bdc1f9164 (diff) | |
Merge "Support the deployment of Ceph over IPv6"
Diffstat (limited to 'puppet/ceph-cluster-config.yaml')
| -rw-r--r-- | puppet/ceph-cluster-config.yaml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml index 96198c3f..dc2f98ed 100644 --- a/puppet/ceph-cluster-config.yaml +++ b/puppet/ceph-cluster-config.yaml @@ -39,6 +39,9 @@ parameters: CephClientUserName: default: openstack type: string + CephIPv6: + default: False + type: boolean resources: CephClusterConfigImpl: @@ -50,15 +53,25 @@ resources: datafiles: ceph_cluster: mapped_data: + ceph_ipv6: {get_param: CephIPv6} ceph_storage_count: {get_param: ceph_storage_count} ceph_mon_initial_members: list_join: - ',' - {get_param: ceph_mon_names} - ceph::profile::params::mon_host: + ceph_mon_host: list_join: - ',' - {get_param: ceph_mon_ips} + ceph_mon_host_v6: + str_replace: + template: "'[IPS_LIST]'" + params: + IPS_LIST: + list_join: + - '],[' + - {get_param: ceph_mon_ips} + ceph::profile::params::ms_bind_ipv6: {get_param: CephIPv6} ceph::profile::params::fsid: {get_param: ceph_fsid} ceph::profile::params::mon_key: {get_param: ceph_mon_key} # We should use a separated key for the non-admin clients |