Take into account actual compute.(ceph|lvm).ephemeral value
This change adds additinal check for compute.(ceph|lvm).ephemeral
assuming it is boolean var.
Changes are for Ocata and Pike as they are stable supported releases
by now.
PROD: https://mirantis.jira.com/browse/PROD-19636
Change-Id: I73c3e646b146f33617fb7e72113f4efa3d492b04
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index bb1af40..22ee1bc 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 bc912de..39a2133 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 %}