summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-02 08:51:53 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-02 08:51:53 -0500
commitc6c9169cd5c99092f02886a3439960f01af3ab09 (patch)
tree0b0077468478cfecedb301e559b068794296fa59
parent4e9186ace86e35f0af22e307d1f25e8b03fd1fe1 (diff)
parent0e18d1c2909cb68ae66b911fb8a45982118189c1 (diff)
downloadopenshift-c6c9169cd5c99092f02886a3439960f01af3ab09.tar.gz
openshift-c6c9169cd5c99092f02886a3439960f01af3ab09.tar.bz2
openshift-c6c9169cd5c99092f02886a3439960f01af3ab09.tar.xz
openshift-c6c9169cd5c99092f02886a3439960f01af3ab09.zip
Merge pull request #1293 from smunilla/default_subdomain
aoi: Ask for osm_default_subdomain in interactive mode
-rw-r--r--utils/src/ooinstall/cli_installer.py13
-rw-r--r--utils/src/ooinstall/openshift_ansible.py3
-rw-r--r--utils/test/cli_installer_tests.py2
-rw-r--r--utils/test/fixture.py4
4 files changed, 21 insertions, 1 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):
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py
index 72e8521d0..baab5d56f 100644
--- a/utils/test/cli_installer_tests.py
+++ b/utils/test/cli_installer_tests.py
@@ -102,6 +102,7 @@ hosts:
QUICKHA_CONFIG = """
variant: %s
ansible_ssh_user: root
+master_routingconfig_subdomain: example.com
hosts:
- connect_to: 10.0.0.1
ip: 10.0.0.1
@@ -228,6 +229,7 @@ hosts:
QUICKHA_CONFIG_PRECONFIGURED_LB = """
variant: %s
ansible_ssh_user: root
+master_routingconfig_subdomain: example.com
hosts:
- connect_to: 10.0.0.1
ip: 10.0.0.1
diff --git a/utils/test/fixture.py b/utils/test/fixture.py
index be759578a..1b1c2e5c2 100644
--- a/utils/test/fixture.py
+++ b/utils/test/fixture.py
@@ -11,6 +11,7 @@ from click.testing import CliRunner
SAMPLE_CONFIG = """
variant: %s
ansible_ssh_user: root
+master_routingconfig_subdomain: example.com
hosts:
- connect_to: 10.0.0.1
ip: 10.0.0.1
@@ -196,6 +197,8 @@ def build_input(ssh_user=None, hosts=None, variant_num=None,
inputs.append(master_lb[0])
inputs.append('y' if master_lb[1] else 'n')
+ inputs.append('example.com')
+
# TODO: support option 2, fresh install
if add_nodes:
if schedulable_masters_ok:
@@ -228,4 +231,3 @@ def build_input(ssh_user=None, hosts=None, variant_num=None,
])
return '\n'.join(inputs)
-