summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-14 09:23:10 -0400
committerGitHub <noreply@github.com>2017-09-14 09:23:10 -0400
commit990d16a116fa3d83470e558e706baf08e956f8cf (patch)
treee502a70c66814b4515efa0494a3a81c3b4b10fc4
parentc515805a1ecfa980bc56af4eb58c5655fde6be44 (diff)
parenteca5290aae0cdb33c43d42098197076bcee55236 (diff)
downloadopenshift-990d16a116fa3d83470e558e706baf08e956f8cf.tar.gz
openshift-990d16a116fa3d83470e558e706baf08e956f8cf.tar.bz2
openshift-990d16a116fa3d83470e558e706baf08e956f8cf.tar.xz
openshift-990d16a116fa3d83470e558e706baf08e956f8cf.zip
Merge pull request #5399 from tbielawa/master
Scaffold out the entire build defaults hash
-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