diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-07-29 14:17:06 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-07-29 15:22:44 -0400 |
| commit | 1b98effd4b656ce884d24d6382b4294cb21e911b (patch) | |
| tree | acbeb2005734dca4a39008facbb8d594bed4c971 /utils/test | |
| parent | c70525677eed8818602d2a6db080e009689c0ca3 (diff) | |
| download | openshift-1b98effd4b656ce884d24d6382b4294cb21e911b.tar.gz openshift-1b98effd4b656ce884d24d6382b4294cb21e911b.tar.bz2 openshift-1b98effd4b656ce884d24d6382b4294cb21e911b.tar.xz openshift-1b98effd4b656ce884d24d6382b4294cb21e911b.zip | |
a-o-i: Better inventory group handling
A more dynamic and flexible method of writing out host groups to the ansible
inventory file. To accompany this, in the quick-installer interactive mode
the etcd role is automatically applied to any masters. Anyone hand writing
the quick installer config will now have to explicitly specify which hosts
will be etcd.
Fixes #2200
Diffstat (limited to 'utils/test')
| -rw-r--r-- | utils/test/cli_installer_tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py index 13973f22f..d79163e91 100644 --- a/utils/test/cli_installer_tests.py +++ b/utils/test/cli_installer_tests.py @@ -815,9 +815,9 @@ class AttendedCliTests(OOCliFixture): self.assert_inventory_host_var(inventory, 'nodes', '10.0.0.1', 'openshift_schedulable=False') self.assert_inventory_host_var_unset(inventory, 'nodes', '10.0.0.2', - 'openshift_schedulable') + 'openshift_schedulable=True') self.assert_inventory_host_var_unset(inventory, 'nodes', '10.0.0.3', - 'openshift_schedulable') + 'openshift_schedulable=True') # interactive with config file and some installed some uninstalled hosts @patch('ooinstall.openshift_ansible.run_main_playbook') @@ -939,7 +939,7 @@ class AttendedCliTests(OOCliFixture): self.assert_inventory_host_var(inventory, 'nodes', '10.0.0.3', 'openshift_schedulable=False') self.assert_inventory_host_var_unset(inventory, 'nodes', '10.0.0.4', - 'openshift_schedulable') + 'openshift_schedulable=True') self.assertTrue(inventory.has_section('etcd')) self.assertEquals(3, len(inventory.items('etcd'))) @@ -1122,9 +1122,9 @@ class AttendedCliTests(OOCliFixture): self.assert_inventory_host_var(inventory, 'nodes', '10.0.0.1', 'openshift_schedulable=False') self.assert_inventory_host_var_unset(inventory, 'nodes', '10.0.0.2', - 'openshift_schedulable') + 'openshift_schedulable=True') self.assert_inventory_host_var_unset(inventory, 'nodes', '10.0.0.3', - 'openshift_schedulable') + 'openshift_schedulable=True') # TODO: test with config file, attended add node |