Răsfoiți Sursa

Implement ssh service reload in os morphing subclasses

The logic for configuring and reloading the SSH service is
distro dependent.
Alessandro Pilotti 8 ani în urmă
părinte
comite
901092e94b

+ 1 - 3
coriolis/osmorphing/osmount/base.py

@@ -82,9 +82,7 @@ class BaseSSHOSMountTools(BaseOSMountTools):
             _ssh_connect()
 
     def _allow_ssh_env_vars(self):
-        self._exec_cmd('sudo sed -i -e "\$aAcceptEnv *" /etc/ssh/sshd_config')
-        self._exec_cmd("sudo service sshd reload")
-        return True
+        pass
 
     def _exec_cmd(self, cmd):
         return utils.exec_ssh_cmd(self._ssh, cmd, self._environment)

+ 5 - 0
coriolis/osmorphing/osmount/redhat.py

@@ -21,3 +21,8 @@ class RedHatOSMountTools(base.BaseLinuxOSMountTools):
     def _pre_mount_os(self):
         self._exec_cmd("sudo -E yum install -y lvm2")
         self._exec_cmd("sudo modprobe dm-mod")
+
+    def _allow_ssh_env_vars(self):
+        self._exec_cmd('sudo sed -i -e "\$aAcceptEnv *" /etc/ssh/sshd_config')
+        self._exec_cmd("sudo service sshd reload")
+        return True

+ 5 - 0
coriolis/osmorphing/osmount/ubuntu.py

@@ -19,3 +19,8 @@ class UbuntuOSMountTools(base.BaseLinuxOSMountTools):
         self._exec_cmd("sudo -E apt-get update -y")
         self._exec_cmd("sudo -E apt-get install lvm2 -y")
         self._exec_cmd("sudo modprobe dm-mod")
+
+    def _allow_ssh_env_vars(self):
+        self._exec_cmd('sudo sed -i -e "\$aAcceptEnv *" /etc/ssh/sshd_config')
+        self._exec_cmd("sudo service ssh reload")
+        return True