summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-12-05 14:11:33 -0500
committerGitHub <noreply@github.com>2016-12-05 14:11:33 -0500
commit110fe9352d3d935d1c4c90b16275e14ab2bf2da5 (patch)
treef3b7e6968e83bfb3c24d981bb482e5c346410aac /roles
parent3041cb8a4df8914f5f006f390ebb4cdb3feff47a (diff)
parent4681da7ad9aafbc72adc45693655fc48543938b0 (diff)
downloadopenshift-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')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
-rw-r--r--roles/openshift_master_facts/defaults/main.yml2
2 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 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
diff --git a/roles/openshift_master_facts/defaults/main.yml b/roles/openshift_master_facts/defaults/main.yml
new file mode 100644
index 000000000..f1cbbeb2d
--- /dev/null
+++ b/roles/openshift_master_facts/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+openshift_master_default_subdomain: "{{ lookup('oo_option', 'openshift_master_default_subdomain') | default(None, true) }}"