diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-09-13 14:03:27 +0200 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-09-13 14:03:27 +0200 |
| commit | d2be3821ae085ec7faa2091df7abaf7279a983e3 (patch) | |
| tree | c7626ec4232af4d5ee532ad5cb2b1a3c3fbf42e5 | |
| parent | b6dd8f112cd5506923b4b3ce51a1774b0bfc037c (diff) | |
| download | openshift-d2be3821ae085ec7faa2091df7abaf7279a983e3.tar.gz openshift-d2be3821ae085ec7faa2091df7abaf7279a983e3.tar.bz2 openshift-d2be3821ae085ec7faa2091df7abaf7279a983e3.tar.xz openshift-d2be3821ae085ec7faa2091df7abaf7279a983e3.zip | |
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.
| -rw-r--r-- | roles/static_inventory/templates/inventory.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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 %} |