summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-06 12:16:35 +0000
committerGerrit Code Review <review@openstack.org>2015-07-06 12:16:35 +0000
commit45327bc18712b90d00a8ae0d61df210f46ec3376 (patch)
tree1cb28b6f194e909dac8d38cbeb798909d5440c69
parent70148d3fd4f063efc7d9ea0f9a4506fa57575dc4 (diff)
parent5965f7ab6cc60105e614d32ef2bb29205d81237d (diff)
Merge "Map NovaEnableRbdBackend to ephemeral_storage from nova::compute::rbd"
-rw-r--r--puppet/compute-puppet.yaml2
-rw-r--r--puppet/manifests/overcloud_compute.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 7e49bc22..afe85d18 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -351,7 +351,7 @@ resources:
nova::compute::libvirt::libvirt_virt_type: {get_input: nova_compute_libvirt_type}
nova_api_host: {get_input: nova_api_host}
nova::compute::vncproxy_host: {get_input: nova_public_ip}
- nova_enable_rbd_backend: {get_input: nova_enable_rbd_backend}
+ nova::compute::rbd::ephemeral_storage: {get_input: nova_enable_rbd_backend}
nova_password: {get_input: nova_password}
nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address}
ceilometer::debug: {get_input: debug}
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 00bab7f6..cc26f851 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -51,7 +51,7 @@ nova_config {
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
}
-$nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false)
+$nova_enable_rbd_backend = hiera('nova::compute::rbd::ephemeral_storage', false)
if $nova_enable_rbd_backend {
include ::ceph::profile::client