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/manifests/overcloud_compute.pp | |
parent | 164fcec5b5f1893d67111099125fe05b3d712623 (diff) | |
parent | 99cdabc403e5e9ff66182526ff6c577bdc1f9164 (diff) |
Merge "Support the deployment of Ceph over IPv6"
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
-rw-r--r-- | puppet/manifests/overcloud_compute.pp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index c5762be0..7c8cda71 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -62,6 +62,14 @@ nova_config { $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) $rbd_persistent_storage = hiera('rbd_persistent_storage', false) if $rbd_ephemeral_storage or $rbd_persistent_storage { + if str2bool(hiera('ceph_ipv6', false)) { + $mon_host = hiera('ceph_mon_host_v6') + } else { + $mon_host = hiera('ceph_mon_host') + } + class { '::ceph::profile::params': + mon_host => $mon_host, + } include ::ceph::conf include ::ceph::profile::client |