aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/ceph-cluster-config.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-01-25 13:05:57 +0100
committerAttila Darazs <adarazs@redhat.com>2016-03-10 18:21:39 +0100
commit99cdabc403e5e9ff66182526ff6c577bdc1f9164 (patch)
treed093f6405e2ef8d20c9f67cbdfb679b1733c60e1 /puppet/ceph-cluster-config.yaml
parentdfb70bd5b3d133a614193e42d04a7a69b0bb821b (diff)
Support the deployment of Ceph over IPv6
To deploy Ceph on IPv6, we need to enable ms_bind_ipv6 in addition to passing the list of MON IPs in brackets. Change-Id: I3644b8fc06458e68574afa5573f07442f0a09190
Diffstat (limited to 'puppet/ceph-cluster-config.yaml')
-rw-r--r--puppet/ceph-cluster-config.yaml15
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