Merge "Take into account actual compute.(ceph|lvm).ephemeral value"
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index 885294a..aafb8d3 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -5959,7 +5959,7 @@
inject_key=True
vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
-{%- if compute.get('ceph', {}).ephemeral is defined %}
+{%- if compute.get('ceph', {}).get('ephemeral', False) %}
images_type=rbd
images_rbd_pool={{ compute.ceph.rbd_pool }}
images_rbd_ceph_conf=/etc/ceph/ceph.conf
@@ -5967,7 +5967,7 @@
rbd_secret_uuid={{ compute.ceph.secret_uuid }}
inject_password=false
inject_key=false
-{%- elif compute.get('lvm', {}).ephemeral is defined %}
+{%- elif compute.get('lvm', {}).get('ephemeral', False) %}
images_type=lvm
images_volume_group={{ compute.lvm.images_volume_group }}
{%- if compute.lvm.volume_clear is defined %}
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index cbd80f1..e604d72 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -5990,7 +5990,7 @@
inject_key=True
vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
-{%- if compute.get('ceph', {}).ephemeral is defined %}
+{%- if compute.get('ceph', {}).get('ephemeral', False) %}
images_type=rbd
images_rbd_pool={{ compute.ceph.rbd_pool }}
images_rbd_ceph_conf=/etc/ceph/ceph.conf
@@ -5998,7 +5998,7 @@
rbd_secret_uuid={{ compute.ceph.secret_uuid }}
inject_password=false
inject_key=false
-{%- elif compute.get('lvm', {}).ephemeral is defined %}
+{%- elif compute.get('lvm', {}).get('ephemeral', False) %}
images_type=lvm
images_volume_group={{ compute.lvm.images_volume_group }}
{%- if compute.lvm.volume_clear is defined %}