diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-12-05 14:11:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 14:11:33 -0500 |
| commit | 110fe9352d3d935d1c4c90b16275e14ab2bf2da5 (patch) | |
| tree | f3b7e6968e83bfb3c24d981bb482e5c346410aac /roles/openshift_facts | |
| parent | 3041cb8a4df8914f5f006f390ebb4cdb3feff47a (diff) | |
| parent | 4681da7ad9aafbc72adc45693655fc48543938b0 (diff) | |
| download | openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.tar.gz openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.tar.bz2 openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.tar.xz openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.zip | |
Merge pull request #2914 from abutcher/upgrade-admission-check
Conditionalize master config update for admission_plugin_config.
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index eb29848ff..2495ad46c 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1647,10 +1647,10 @@ def set_proxy_facts(facts): # If we're actually defining a proxy config then create admission_plugin_config # if it doesn't exist, then merge builddefaults[config] structure # into admission_plugin_config - if 'admission_plugin_config' not in facts['master']: - facts['master']['admission_plugin_config'] = dict() if 'config' in builddefaults and ('http_proxy' in builddefaults or 'https_proxy' in builddefaults): + if 'admission_plugin_config' not in facts['master']: + facts['master']['admission_plugin_config'] = dict() facts['master']['admission_plugin_config'].update(builddefaults['config']) facts['builddefaults'] = builddefaults |