Improve Podman provider

src/mrack/providers/podman.py

@@ -50,6 +50,7 @@ async def init(
         self,
         container_images,
         default_network,
+        network_options,
         ssh_key,
         container_options,
         extra_commands,
@@ -63,6 +64,7 @@ async def init(
         self.max_retry = max_retry
         self.images = container_images
         self.default_network = default_network
+        self.network_options = network_options
         self.ssh_key = ssh_key
         self.podman_options = container_options
         self.extra_commands = extra_commands
@@ -93,7 +95,11 @@ async def prepare_provisioning(self, reqs):
             awaitables = []
             for network in network_list:
                 if not await self.podman.network_exists(network):
-                    awaitables.append(self.podman.network_create(network))
+                    awaitables.append(
+                        self.podman.network_create(
+                            network, options=self.network_options
+                        )
+                    )
 
             network_results = await asyncio.gather(*awaitables)
             success = all(network_results)
@@ -173,7 +179,8 @@ async def wait_till_provisioned(self, resource):
 
         while datetime.now() < timeout_time:
             try:
-                server = await self.podman.inspect(cont_id)[0]
+                servers = await self.podman.inspect(cont_id)
+                server = servers[0]
             except ProvisioningError as err:
                 logger.error(f"{log_msg_start} {object2json(err)}")
                 raise ServerNotFoundError(cont_id) from err
@@ -223,6 +230,22 @@ async def wait_till_provisioned(self, resource):
 
         return server, req
 
+    async def _wait_for_ssh(self, host, timeout, port):
+        log_msg_start = f"{self.dsp_name} [{host}]"
+        start_ssh = datetime.now()
+        while True:
+            res = await self.podman.exec_command(
+                host._host_id, "systemctl -q is-active sshd"
+            )
+            logger.info(f"{log_msg_start} ran is-active for ssh, result '{res}'")
+            if not res:
+                await asyncio.sleep(10)
+                if datetime.now() - start_ssh >= timedelta(seconds=(timeout * 60)):
+                    break
+            else:
+                break
+        return res, host
+
     async def delete_host(self, host_id, host_name):
         """Delete provisioned host."""
         # if there is no container we do nothing

src/mrack/providers/utils/podman.py

@@ -121,14 +121,16 @@ async def network_exists(self, network):
         _stdout, _stderr, inspect = await self._run_podman(args, raise_on_err=False)
         return inspect.returncode == 0
 
-    async def network_create(self, network):
+    async def network_create(self, network, options=None):
         """Create a podman network if it does not exist."""
         if await self.network_exists(network):
             logger.debug(f"{self.dsp_name} Network '{network}' is present")
             return 0
 
         logger.info(f"{self.dsp_name} Creating podman network '{network}'")
         args = ["network", "create", network]
+        if options:
+            args.extend(options)
         _stdout, _stderr, process = await self._run_podman(args, raise_on_err=False)
 
         return process.returncode == 0

src/mrack/transformers/podman.py

@@ -29,6 +29,7 @@ class PodmanTransformer(Transformer):
         "images",
         "pubkey",
         "default_network",
+        "network_options",
         "podman_options",
     ]
 
@@ -38,8 +39,9 @@ async def init_provider(self):
 
         await self._provider.init(
             container_images=self.config["images"].values(),
-            ssh_key=self.config["pubkey"],
             default_network=self.config["default_network"],
+            network_options=self.config.get("network_options", []),
+            ssh_key=self.config["pubkey"],
             container_options=self.config["podman_options"],
             extra_commands=self.config.get("extra_commands", []),
             strategy=self.config.get("strategy", STRATEGY_ABORT),