Explorar o código

Merged in aznashwan/coriolis/mount-bind (pull request #112)

Skip mount-binding missing directories during OSMount.

Approved-by: Arin Toaca <atoaca@cloudbasesolutions.com>
Nashwan Azhari %!s(int64=8) %!d(string=hai) anos
pai
achega
33687a7a11
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      coriolis/osmorphing/osmount/base.py

+ 4 - 0
coriolis/osmorphing/osmount/base.py

@@ -252,6 +252,10 @@ class BaseLinuxOSMountTools(BaseSSHOSMountTools):
 
         for dir in set(dirs).intersection(['proc', 'sys', 'dev', 'run']):
             mount_dir = os.path.join(os_root_dir, dir)
+            if not utils.test_ssh_path(self._ssh, mount_dir):
+                LOG.info(
+                    "No '%s' directory in mounted OS. Skipping mount.", dir)
+                continue
             self._exec_cmd(
                 'sudo mount -o bind /%(dir)s/ %(mount_dir)s' %
                 {'dir': dir, 'mount_dir': mount_dir})