diff options
author | Samuel Munilla <smunilla@redhat.com> | 2016-01-27 14:41:39 -0500 |
---|---|---|
committer | Samuel Munilla <smunilla@redhat.com> | 2016-02-02 08:50:52 -0500 |
commit | 0e18d1c2909cb68ae66b911fb8a45982118189c1 (patch) | |
tree | 0b0077468478cfecedb301e559b068794296fa59 /utils/src/ooinstall | |
parent | 4e9186ace86e35f0af22e307d1f25e8b03fd1fe1 (diff) | |
download | openshift-0e18d1c2909cb68ae66b911fb8a45982118189c1.tar.gz openshift-0e18d1c2909cb68ae66b911fb8a45982118189c1.tar.bz2 openshift-0e18d1c2909cb68ae66b911fb8a45982118189c1.tar.xz openshift-0e18d1c2909cb68ae66b911fb8a45982118189c1.zip |
aoi: Ask for osm_default_subdomain in interactive mode
Add a question to ask the user for a default subdomain.
Diffstat (limited to 'utils/src/ooinstall')
-rw-r--r-- | utils/src/ooinstall/cli_installer.py | 13 | ||||
-rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 3 |
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): |