summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2017-09-12 10:40:33 -0400
committerTim Bielawa <tbielawa@redhat.com>2017-09-13 14:29:59 -0400
commiteca5290aae0cdb33c43d42098197076bcee55236 (patch)
tree6fd6efdc2e49df1e2f0d4f3e53fe92f18a616342
parent665c5c2058b989a58a99022be198e9c7a6383a1a (diff)
downloadopenshift-eca5290aae0cdb33c43d42098197076bcee55236.tar.gz
openshift-eca5290aae0cdb33c43d42098197076bcee55236.tar.bz2
openshift-eca5290aae0cdb33c43d42098197076bcee55236.tar.xz
openshift-eca5290aae0cdb33c43d42098197076bcee55236.zip
Scaffold out the entire build defaults hash
Some functions called later may expect sub-keys to exist which will not with the current default empty-dict.
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index ebfa6bb8f..517e0231d 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1602,11 +1602,13 @@ def set_builddefaults_facts(facts):
builddefaults['git_no_proxy'] = builddefaults['no_proxy']
# If we're actually defining a builddefaults config then create admission_plugin_config
# then merge builddefaults[config] structure into admission_plugin_config
+
+ # 'config' is the 'openshift_builddefaults_json' inventory variable
if 'config' in builddefaults:
if 'admission_plugin_config' not in facts['master']:
- facts['master']['admission_plugin_config'] = dict()
+ # Scaffold out the full expected datastructure
+ facts['master']['admission_plugin_config'] = {'BuildDefaults': {'configuration': {'env': {}}}}
facts['master']['admission_plugin_config'].update(builddefaults['config'])
- # if the user didn't actually provide proxy values, delete the proxy env variable defaults.
delete_empty_keys(facts['master']['admission_plugin_config']['BuildDefaults']['configuration']['env'])
return facts