summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-04 12:54:53 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-04 12:54:53 -0500
commita467f94a0157eaee88900dd466dd79dab2befa52 (patch)
tree3e7235ba7f11c6426bb149f108c7f4b657f3906b
parente20ecb300afb7978c7fd62109a426ca2ec1aeaf1 (diff)
parentabed216e09a946661ba802b4a0a71e5ec89c0a7a (diff)
downloadopenshift-a467f94a0157eaee88900dd466dd79dab2befa52.tar.gz
openshift-a467f94a0157eaee88900dd466dd79dab2befa52.tar.bz2
openshift-a467f94a0157eaee88900dd466dd79dab2befa52.tar.xz
openshift-a467f94a0157eaee88900dd466dd79dab2befa52.zip
Merge pull request #1335 from smunilla/default_master_routingconfig_subdomain
aoi: Safer check for master_routingconfig_subdomain
-rw-r--r--utils/src/ooinstall/openshift_ansible.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index cbb6f33e1..042ce1023 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -114,7 +114,7 @@ def write_inventory_vars(base_inventory, multiple_masters, proxy):
base_inventory.write('openshift_master_cluster_method=native\n')
base_inventory.write("openshift_master_cluster_hostname={}\n".format(proxy.hostname))
base_inventory.write("openshift_master_cluster_public_hostname={}\n".format(proxy.public_hostname))
- if CFG.settings['master_routingconfig_subdomain']:
+ if CFG.settings.get('master_routingconfig_subdomain', False):
base_inventory.write("osm_default_subdomain={}\n".format(CFG.settings['master_routingconfig_subdomain']))