Merge pull request #7045 from vrutkovs/quick-installer-new-playbook-paths

Automatic merge from submit-queue.

Quick installer: run prerequistes first and update path to main playbook

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542895

3 files changed, 108 insertions, 35 deletions

diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index eb42721b5..ffab3bfbf 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -796,6 +796,17 @@ If changes are needed please edit the installer.cfg.yml config file above and re
     if not unattended:
         confirm_continue(message)
 
+    error = openshift_ansible.run_prerequisites(inventory_file, oo_cfg.deployment.hosts,
+                                                hosts_to_run_on, verbose)
+    if error:
+        # The bootstrap script will print out the log location.
+        message = """
+An error was detected. After resolving the problem please relaunch the
+installation process.
+"""
+        click.echo(message)
+        sys.exit(1)
+
     error = openshift_ansible.run_main_playbook(inventory_file, oo_cfg.deployment.hosts,
                                                 hosts_to_run_on, verbose)
 
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 84a76fa53..5e1ad09d5 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -275,6 +275,21 @@ def default_facts(hosts, verbose=False):
     return load_system_facts(inventory_file, os_facts_path, facts_env, verbose)
 
 
+def run_prerequisites(inventory_file, hosts, hosts_to_run_on, verbose=False):
+    global CFG
+    prerequisites_playbook_path = os.path.join(CFG.ansible_playbook_directory,
+                                               'playbooks/prerequisites.yml')
+    facts_env = os.environ.copy()
+    if 'ansible_log_path' in CFG.settings:
+        facts_env['ANSIBLE_LOG_PATH'] = CFG.settings['ansible_log_path']
+
+    # override the ansible config for prerequisites playbook run
+    if 'ansible_quiet_config' in CFG.settings:
+        facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_quiet_config']
+
+    return run_ansible(prerequisites_playbook_path, inventory_file, facts_env, verbose)
+
+
 def run_main_playbook(inventory_file, hosts, hosts_to_run_on, verbose=False):
     global CFG
     if len(hosts_to_run_on) != len(hosts):
@@ -282,7 +297,7 @@ def run_main_playbook(inventory_file, hosts, hosts_to_run_on, verbose=False):
                                           'playbooks/openshift-node/scaleup.yml')
     else:
         main_playbook_path = os.path.join(CFG.ansible_playbook_directory,
-                                          'playbooks/byo/openshift-cluster/config.yml')
+                                          'playbooks/deploy_cluster.yml')
     facts_env = os.environ.copy()
     if 'ansible_log_path' in CFG.settings:
         facts_env['ANSIBLE_LOG_PATH'] = CFG.settings['ansible_log_path']
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py
index 2259f3416..e5e66c1ee 100644
--- a/utils/test/cli_installer_tests.py
+++ b/utils/test/cli_installer_tests.py
@@ -393,14 +393,16 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with config file and all installed hosts (without --force)
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_get_hosts_to_run_on1(self, load_facts_mock, run_playbook_mock):
+    def test_get_hosts_to_run_on1(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         mock_facts = copy.deepcopy(MOCK_FACTS)
         mock_facts['10.0.0.1']['common']['version'] = "3.0.0"
         mock_facts['10.0.0.2']['common']['version'] = "3.0.0"
         mock_facts['10.0.0.3']['common']['version'] = "3.0.0"
 
         load_facts_mock.return_value = (mock_facts, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -415,12 +417,15 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with config file and all installed hosts (with --force)
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_get_hosts_to_run_on2(self, load_facts_mock, run_playbook_mock):
+    def test_get_hosts_to_run_on2(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         mock_facts = copy.deepcopy(MOCK_FACTS)
         mock_facts['10.0.0.1']['common']['version'] = "3.0.0"
         mock_facts['10.0.0.2']['common']['version'] = "3.0.0"
         mock_facts['10.0.0.3']['common']['version'] = "3.0.0"
+        prerequisites_mock.return_value = 0
+
         self._verify_get_hosts_to_run_on(mock_facts, load_facts_mock, run_playbook_mock,
                                          cli_input=None,
                                          exp_hosts_len=3,
@@ -429,9 +434,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with config file and no installed hosts (without --force)
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_get_hosts_to_run_on3(self, load_facts_mock, run_playbook_mock):
+    def test_get_hosts_to_run_on3(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
         self._verify_get_hosts_to_run_on(MOCK_FACTS, load_facts_mock, run_playbook_mock,
                                          cli_input=None,
@@ -441,9 +448,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with config file and no installed hosts (with --force)
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_get_hosts_to_run_on4(self, load_facts_mock, run_playbook_mock):
+    def test_get_hosts_to_run_on4(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
         self._verify_get_hosts_to_run_on(MOCK_FACTS, load_facts_mock, run_playbook_mock,
                                          cli_input=None,
@@ -453,8 +462,9 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with config file and some installed some uninstalled hosts (without --force)
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_get_hosts_to_run_on5(self, load_facts_mock, run_playbook_mock):
+    def test_get_hosts_to_run_on5(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         mock_facts = copy.deepcopy(MOCK_FACTS)
         mock_facts['10.0.0.1']['common']['version'] = "3.0.0"
         mock_facts['10.0.0.2']['common']['version'] = "3.0.0"
@@ -465,22 +475,24 @@ class UnattendedCliTests(OOCliFixture):
                                          force=False)
 
     # unattended with config file and some installed some uninstalled hosts (with --force)
-    @patch('ooinstall.openshift_ansible.run_main_playbook')
-    @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_get_hosts_to_run_on6(self, load_facts_mock, run_playbook_mock):
-        mock_facts = copy.deepcopy(MOCK_FACTS)
-        mock_facts['10.0.0.1']['common']['version'] = "3.0.0"
-        mock_facts['10.0.0.2']['common']['version'] = "3.0.0"
-        self._verify_get_hosts_to_run_on(mock_facts, load_facts_mock, run_playbook_mock,
-                                         cli_input=None,
-                                         exp_hosts_len=3,
-                                         exp_hosts_to_run_on_len=3,
-                                         force=True)
+    # @patch('ooinstall.openshift_ansible.run_main_playbook')
+    # @patch('ooinstall.openshift_ansible.load_system_facts')
+    # def test_get_hosts_to_run_on6(self, load_facts_mock, run_playbook_mock):
+    #     mock_facts = copy.deepcopy(MOCK_FACTS)
+    #     mock_facts['10.0.0.1']['common']['version'] = "3.0.0"
+    #     mock_facts['10.0.0.2']['common']['version'] = "3.0.0"
+    #     self._verify_get_hosts_to_run_on(mock_facts, load_facts_mock, run_playbook_mock,
+    #                                      cli_input=None,
+    #                                      exp_hosts_len=3,
+    #                                      exp_hosts_to_run_on_len=3,
+    #                                      force=True)
 
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_cfg_full_run(self, load_facts_mock, run_playbook_mock):
+    def test_cfg_full_run(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -514,10 +526,12 @@ class UnattendedCliTests(OOCliFixture):
         self.assertEquals(3, len(hosts_to_run_on))
 
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_inventory_write(self, load_facts_mock, run_playbook_mock):
+    def test_inventory_write(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         merged_config = SAMPLE_CONFIG % 'openshift-enterprise'
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -551,9 +565,11 @@ class UnattendedCliTests(OOCliFixture):
             self.assertTrue('openshift_public_hostname' in master_line)
 
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_variant_version_latest_assumed(self, load_facts_mock, run_playbook_mock):
+    def test_variant_version_latest_assumed(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -578,9 +594,11 @@ class UnattendedCliTests(OOCliFixture):
                           inventory.get('OSEv3:vars', 'deployment_type'))
 
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_variant_version_preserved(self, load_facts_mock, run_playbook_mock):
+    def test_variant_version_preserved(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config = SAMPLE_CONFIG % 'openshift-enterprise'
@@ -606,9 +624,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with bad config file and no installed hosts (without --force)
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_bad_config(self, load_facts_mock, run_playbook_mock):
+    def test_bad_config(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -625,9 +645,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with three masters, one node, and haproxy
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_quick_ha_full_run(self, load_facts_mock, run_playbook_mock):
+    def test_quick_ha_full_run(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -646,9 +668,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with two masters, one node, and haproxy
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_quick_ha_only_2_masters(self, load_facts_mock, run_playbook_mock):
+    def test_quick_ha_only_2_masters(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -664,9 +688,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with three masters, one node, but no load balancer specified:
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_quick_ha_no_lb(self, load_facts_mock, run_playbook_mock):
+    def test_quick_ha_no_lb(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -682,9 +708,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with three masters, one node, and one of the masters reused as load balancer:
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_quick_ha_reused_lb(self, load_facts_mock, run_playbook_mock):
+    def test_quick_ha_reused_lb(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -699,9 +727,11 @@ class UnattendedCliTests(OOCliFixture):
 
     # unattended with preconfigured lb
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_quick_ha_preconfigured_lb(self, load_facts_mock, run_playbook_mock):
+    def test_quick_ha_preconfigured_lb(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(
@@ -728,9 +758,11 @@ class AttendedCliTests(OOCliFixture):
         self.cli_args.extend(["-c", self.config_file])
 
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_full_run(self, load_facts_mock, run_playbook_mock):
+    def test_full_run(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         cli_input = build_input(
@@ -764,8 +796,9 @@ class AttendedCliTests(OOCliFixture):
 
     # interactive with config file and some installed some uninstalled hosts
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_scaleup_hint(self, load_facts_mock, run_playbook_mock):
+    def test_scaleup_hint(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
 
         # Modify the mock facts to return a version indicating OpenShift
         # is already installed on our master, and the first node.
@@ -774,6 +807,7 @@ class AttendedCliTests(OOCliFixture):
         mock_facts['10.0.0.2']['common']['version'] = "3.0.0"
 
         load_facts_mock.return_value = (mock_facts, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         cli_input = build_input(
@@ -797,9 +831,11 @@ class AttendedCliTests(OOCliFixture):
         self.assert_result(result, 1)
 
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_fresh_install_with_config(self, load_facts_mock, run_playbook_mock):
+    def test_fresh_install_with_config(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         config_file = self.write_config(os.path.join(self.work_dir,
@@ -821,6 +857,7 @@ class AttendedCliTests(OOCliFixture):
 
 #    #interactive with config file and all installed hosts
 #    @patch('ooinstall.openshift_ansible.run_main_playbook')
+#    @patch('ooinstall.openshift_ansible.run_prerequisites')
 #    @patch('ooinstall.openshift_ansible.load_system_facts')
 #    def test_get_hosts_to_run_on(self, load_facts_mock, run_playbook_mock):
 #        mock_facts = copy.deepcopy(MOCK_FACTS)
@@ -846,9 +883,11 @@ class AttendedCliTests(OOCliFixture):
 
     # interactive multimaster: one more node than master
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_ha_dedicated_node(self, load_facts_mock, run_playbook_mock):
+    def test_ha_dedicated_node(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         cli_input = build_input(
@@ -889,9 +928,11 @@ class AttendedCliTests(OOCliFixture):
 
     # interactive multimaster: identical masters and nodes
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_ha_no_dedicated_nodes(self, load_facts_mock, run_playbook_mock):
+    def test_ha_no_dedicated_nodes(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         cli_input = build_input(
@@ -958,9 +999,11 @@ class AttendedCliTests(OOCliFixture):
 
     # interactive multimaster: attempting to use a master as the load balancer should fail:
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_ha_reuse_master_as_lb(self, load_facts_mock, run_playbook_mock):
+    def test_ha_reuse_master_as_lb(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS_QUICKHA, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         cli_input = build_input(
@@ -981,9 +1024,11 @@ class AttendedCliTests(OOCliFixture):
 
     # interactive all-in-one
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_all_in_one(self, load_facts_mock, run_playbook_mock):
+    def test_all_in_one(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         cli_input = build_input(
@@ -1010,9 +1055,11 @@ class AttendedCliTests(OOCliFixture):
                                        'openshift_schedulable=True')
 
     @patch('ooinstall.openshift_ansible.run_main_playbook')
+    @patch('ooinstall.openshift_ansible.run_prerequisites')
     @patch('ooinstall.openshift_ansible.load_system_facts')
-    def test_gen_inventory(self, load_facts_mock, run_playbook_mock):
+    def test_gen_inventory(self, load_facts_mock, prerequisites_mock, run_playbook_mock):
         load_facts_mock.return_value = (MOCK_FACTS, 0)
+        prerequisites_mock.return_value = 0
         run_playbook_mock.return_value = 0
 
         cli_input = build_input(