diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 16:55:34 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 16:55:34 -0400 |
| commit | a1c82b94f86e4fe0e60edaa5516cad6c7a0535dd (patch) | |
| tree | fa2604e99530acf025ca417a40cbd669e12e58fd /playbooks/common/openshift-master | |
| parent | 47f50d5d1a7b4beb89479d9452b95e1c1030b8dc (diff) | |
| parent | e3e6c094ad492bfe834ab736ab8c92f106ec1938 (diff) | |
| download | openshift-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
Diffstat (limited to 'playbooks/common/openshift-master')
| -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: |