diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2016-04-22 15:01:39 -0400 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-04-25 15:31:45 -0400 |
commit | e3e6c094ad492bfe834ab736ab8c92f106ec1938 (patch) | |
tree | 1db4fc324f6c69bdb8a072eca3615d6d98fc3bf3 /playbooks/common/openshift-master/config.yml | |
parent | 3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff) | |
download | openshift-e3e6c094ad492bfe834ab736ab8c92f106ec1938.tar.gz openshift-e3e6c094ad492bfe834ab736ab8c92f106ec1938.tar.bz2 openshift-e3e6c094ad492bfe834ab736ab8c92f106ec1938.tar.xz openshift-e3e6c094ad492bfe834ab736ab8c92f106ec1938.zip |
Fix backward compat for osm_default_subdomain
Diffstat (limited to 'playbooks/common/openshift-master/config.yml')
-rw-r--r-- | playbooks/common/openshift-master/config.yml | 5 |
1 files changed, 2 insertions, 3 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: |