Merge pull request #1293 from smunilla/default_subdomain

aoi: Ask for osm_default_subdomain in interactive mode

2 files changed, 16 insertions, 0 deletions

diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 1aacf3a4b..3046d4d58 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -45,6 +45,15 @@ passwordless sudo access.
     click.echo(message)
     return click.prompt('User for ssh access', default='root')
 
+def get_master_routingconfig_subdomain():
+    click.clear()
+    message = """
+You might want to override the default subdomain uses for exposed routes. If you don't know what
+this is, use the default value.
+"""
+    click.echo(message)
+    return click.prompt('New default subdomain (ENTER for none)', default='')
+
 def list_hosts(hosts):
     hosts_idx = range(len(hosts))
     for idx in hosts_idx:
@@ -498,6 +507,10 @@ https://docs.openshift.com/enterprise/latest/admin_guide/install/prerequisites.h
         oo_cfg.hosts = collect_hosts(oo_cfg)
         click.clear()
 
+    if not oo_cfg.settings.get('master_routingconfig_subdomain', None):
+        oo_cfg.settings['master_routingconfig_subdomain'] = get_master_routingconfig_subdomain()
+        click.clear()
+
     return oo_cfg
 
 
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index c0d115fdc..cbb6f33e1 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -114,6 +114,9 @@ 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']:
+        base_inventory.write("osm_default_subdomain={}\n".format(CFG.settings['master_routingconfig_subdomain']))
+
 
 
 def write_host(host, inventory, schedulable=None):