From 4681da7ad9aafbc72adc45693655fc48543938b0 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Mon, 5 Dec 2016 11:44:26 -0500 Subject: Conditionalize master config update for admission_plugin_config. --- roles/openshift_facts/library/openshift_facts.py | 4 ++-- roles/openshift_master_facts/defaults/main.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 roles/openshift_master_facts/defaults/main.yml (limited to 'roles') 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) }}" -- cgit v1.2.3