Merge pull request bn222#384 from almusil/improvements

Deployment speed up

Author: bn222

clusterDeployer.py

@@ -367,9 +367,8 @@ def create_masters(self) -> None:
         logger.info('updating /etc/hosts')
         self.update_etc_hosts()
 
-        logger.info("Setting password to for root to redhat")
-        for master in master_nodes:
-            master.set_password()
+        nodes_with_futures = [(n.config.name, executor.submit(n.set_password)) for n in master_nodes]
+        wait_futures("set root password to redhat", nodes_with_futures)
 
         self.update_dnsmasq()
 
@@ -440,10 +439,8 @@ def create_workers(self) -> None:
 
         self.wait_for_workers()
 
-        logger.info("Setting password to for root to redhat")
-        for h in hosts_with_workers:
-            for worker in h.k8s_worker_nodes:
-                worker.set_password()
+        nodes_with_futures = [(n.config.name, executor.submit(n.set_password)) for n in worker_nodes]
+        wait_futures("set root password to redhat", nodes_with_futures)
 
     def _wait_master_reboot(self, infra_env: str, node: ClusterNode) -> bool:
         def master_ready(ai: AssistedClientAutomation, node_name: str) -> bool:

clusterNode.py

@@ -60,10 +60,11 @@ def teardown(self) -> None:
     def ensure_reboot(self) -> bool:
         return True
 
-    def set_password(self, user: str = "root", password: str = "redhat") -> None:
+    def set_password(self, user: str = "root", password: str = "redhat") -> bool:
         rh = host.RemoteHost(self.ip())
         rh.ssh_connect("core")
         rh.run_or_die(f"echo {user}:{password} | sudo chpasswd")
+        return True
 
     def print_logs(self) -> None:
         rh = host.RemoteHost(self.ip())

common.py

@@ -680,6 +680,7 @@ def get_future_state(future: Future[bool]) -> str:
         else:
             return "Fail"
 
+    futures = sorted(futures)
     state = {name: get_future_state(future) for (name, future) in futures}
     logger.info(f"Waiting for {msg}: {state}")
     max_tries = 200 * 6