diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-02 08:51:53 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-02 08:51:53 -0500 |
| commit | c6c9169cd5c99092f02886a3439960f01af3ab09 (patch) | |
| tree | 0b0077468478cfecedb301e559b068794296fa59 /utils/test | |
| parent | 4e9186ace86e35f0af22e307d1f25e8b03fd1fe1 (diff) | |
| parent | 0e18d1c2909cb68ae66b911fb8a45982118189c1 (diff) | |
| download | openshift-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
Diffstat (limited to 'utils/test')
| -rw-r--r-- | utils/test/cli_installer_tests.py | 2 | ||||
| -rw-r--r-- | utils/test/fixture.py | 4 |
2 files changed, 5 insertions, 1 deletions
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) - |