From d2be3821ae085ec7faa2091df7abaf7279a983e3 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Wed, 13 Sep 2017 14:03:27 +0200
Subject: Fix the cinder_registry_volume conditional
Deployments without the cinder registry would fail, because the
`cinder_registry_volume` variable is still set even when we don't
actually create the volume.
---
roles/static_inventory/templates/inventory.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/static_inventory/templates/inventory.j2 b/roles/static_inventory/templates/inventory.j2
index 640a46ba2..2245963c0 100644
--- a/roles/static_inventory/templates/inventory.j2
+++ b/roles/static_inventory/templates/inventory.j2
@@ -46,7 +46,7 @@ lb
# For OSEv3 normal group vars, see ./group_vars/OSEv3.yml
-{% if cinder_registry_volume is defined %}
+{% if cinder_registry_volume is defined and 'volume' in cinder_registry_volume %}
openshift_hosted_registry_storage_openstack_volumeID="{{ cinder_registry_volume.id }}"
openshift_hosted_registry_storage_volume_size="{{ cinder_registry_volume.volume.size }}Gi"
{% endif %}
--
cgit v1.2.3