Cinder prevent yaml from failing
When including /meta/salt.yml from outside of this
formula the yaml can fail if appropriate pillar elements are not
found. Changing syntax to eliminate this. Including the file
above is needed for generating minion orchestration config
for future use with salt orchestration methods
Change-Id: If8f0974f38a915f9e9a047c9c9ef7652ac239476
Related-PROD: PROD-19973
diff --git a/cinder/map.jinja b/cinder/map.jinja
index 957f37f..22fd95a 100644
--- a/cinder/map.jinja
+++ b/cinder/map.jinja
@@ -69,7 +69,7 @@
},
},
},
-}, merge=pillar.cinder.get('controller', {}), base='BaseDefaults') %}
+}, merge=pillar.get('cinder', {}).get('controller', {}), base='BaseDefaults') %}
{% set volume = salt['grains.filter_by']({
'BaseDefaults': default_params,
@@ -131,7 +131,7 @@
},
},
},
-}, merge=pillar.cinder.get('volume', {}), base='BaseDefaults') %}
+}, merge=pillar.get('cinder', {}).get('volume', {}), base='BaseDefaults') %}
{% set client = salt['grains.filter_by']({
'BaseDefaults': default_params,
@@ -141,7 +141,7 @@
'RedHat': {
'pkgs': ['python-cinderclient']
},
-}, merge=pillar.cinder.get('client', {}), base='BaseDefaults') %}
+}, merge=pillar.get('cinder', {}).get('client', {}), base='BaseDefaults') %}
{% set monitoring = salt['grains.filter_by']({
'default': {