Просмотр исходного кода

Fix SSH reload on OSMorphing worker

Fixes SSH daemon restart on newer versions of Linux OSMorphing workers by using
`systemctl`, if available. Formerly, `service` command was used by default,
which is no longer available on newer images.
Daniel Vincze 2 лет назад
Родитель
Сommit
32a864435c
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      coriolis/osmorphing/osmount/redhat.py
  2. 1 1
      coriolis/osmorphing/osmount/ubuntu.py

+ 1 - 1
coriolis/osmorphing/osmount/redhat.py

@@ -25,5 +25,5 @@ class RedHatOSMountTools(base.BaseLinuxOSMountTools):
 
     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")
+        utils.restart_service(self._ssh, "sshd")
         return True

+ 1 - 1
coriolis/osmorphing/osmount/ubuntu.py

@@ -23,5 +23,5 @@ class UbuntuOSMountTools(base.BaseLinuxOSMountTools):
 
     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")
+        utils.restart_service(self._ssh, "sshd")
         return True