diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-10-16 14:31:31 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-10-16 14:31:31 +0000 |
commit | 4fc272c30ae43e5c5866c057870752aa3f835965 (patch) | |
tree | 14937c23de70f5925810146c3933d215aa8e2346 /puppet/manifests/overcloud_compute.pp | |
parent | 954491c442cbc34ec0a17086d4e90247437b1712 (diff) | |
parent | 9da4faececc2e6aadd18ae034c37b9c8307d7549 (diff) |
Merge "Puppet / Compute: allow to run Ephemeral only storage with RBD"
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
-rw-r--r-- | puppet/manifests/overcloud_compute.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index a0ef701a..2150bab8 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -43,8 +43,9 @@ nova_config { 'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver'; } -$nova_enable_rbd_backend = hiera('nova::compute::rbd::ephemeral_storage', false) -if $nova_enable_rbd_backend { +$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 { include ::ceph::profile::client $client_keys = hiera('ceph::profile::params::client_keys') |