summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-25 16:55:34 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-25 16:55:34 -0400
commita1c82b94f86e4fe0e60edaa5516cad6c7a0535dd (patch)
treefa2604e99530acf025ca417a40cbd669e12e58fd
parent47f50d5d1a7b4beb89479d9452b95e1c1030b8dc (diff)
parente3e6c094ad492bfe834ab736ab8c92f106ec1938 (diff)
downloadopenshift-a1c82b94f86e4fe0e60edaa5516cad6c7a0535dd.tar.gz
openshift-a1c82b94f86e4fe0e60edaa5516cad6c7a0535dd.tar.bz2
openshift-a1c82b94f86e4fe0e60edaa5516cad6c7a0535dd.tar.xz
openshift-a1c82b94f86e4fe0e60edaa5516cad6c7a0535dd.zip
Merge pull request #1793 from detiber/default_subdomain
Fix backward compat for osm_default_subdomain
-rw-r--r--playbooks/common/openshift-master/config.yml5
-rw-r--r--roles/openshift_master_facts/tasks/main.yml2
2 files changed, 3 insertions, 4 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 0b0faaa22..060b5aa0d 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -35,9 +35,9 @@
- set_fact:
openshift_master_debug_level: "{{ t_oo_option_master_debug_level }}"
when: openshift_master_debug_level is not defined and t_oo_option_master_debug_level != ""
-
+
- set_fact:
- openshift_master_default_subdomain: "{{ lookup('oo_option', 'openshift_master_default_subdomain') | default(None) }}"
+ openshift_master_default_subdomain: "{{ lookup('oo_option', 'openshift_master_default_subdomain') | default(None, true) }}"
when: openshift_master_default_subdomain is not defined
- set_fact:
openshift_hosted_metrics_deploy: "{{ lookup('oo_option', 'openshift_hosted_metrics_deploy') | default(false, true) }}"
@@ -48,7 +48,6 @@
- set_fact:
openshift_hosted_metrics_resolution: "{{ lookup('oo_option', 'openshift_hosted_metrics_resolution') | default(10) }}"
when: openshift_hosted_metrics_resolution is not defined
-
roles:
- openshift_facts
post_tasks:
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index a020fdb41..d39c89516 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -46,7 +46,7 @@
oauth_grant_method: "{{ openshift_master_oauth_grant_method | default(None) }}"
sdn_cluster_network_cidr: "{{ osm_cluster_network_cidr | default(None) }}"
sdn_host_subnet_length: "{{ osm_host_subnet_length | default(None) }}"
- default_subdomain: "{{ openshift_master_default_subdomain | default(osm_default_subdomain) | default(None) }}"
+ default_subdomain: "{{ openshift_master_default_subdomain | default(osm_default_subdomain | default(None), true) }}"
custom_cors_origins: "{{ osm_custom_cors_origins | default(None) }}"
default_node_selector: "{{ osm_default_node_selector | default(None) }}"
project_request_message: "{{ osm_project_request_message | default(None) }}"