X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fceph-cluster-config.yaml;h=dc2f98eda10484820077e4dadbb42c9f43f5f3b1;hb=de0ac7b2d6a2b58e2c39f06c8d4a72278b574201;hp=96198c3f3fcbefeac84bec87ea0070a11d7509ad;hpb=263ba3386f2f6446f5d65eb8ce21e46e657b4e94;p=apex-tripleo-heat-templates.git

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