diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-15 19:04:32 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-15 19:06:01 +0100 |
| commit | 2ce837eba9e229c6a974b6e71c91a1d658d4b3d7 (patch) | |
| tree | 4be34f43c53427cc8f0848e80ec4b025679568e4 /patches/opnfv-fuel | |
| parent | bb4f4b671e3043b0b1483bf44b707b092b2333af (diff) | |
fuel-main: Restart sshd service instead of reload
Backported from [1] until we switch to Newton and sync again
with Fuel@OPNFV master.
[1] https://gerrit.opnfv.org/gerrit/#/c/25867/
Change-Id: I0972218eaf7aeb9cb435f6408e140b502fc1c0ed
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
| -rw-r--r-- | patches/opnfv-fuel/upstream-backports/0006-Restart-sshd-service-instead-of-reload.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/upstream-backports/0006-Restart-sshd-service-instead-of-reload.patch b/patches/opnfv-fuel/upstream-backports/0006-Restart-sshd-service-instead-of-reload.patch new file mode 100644 index 00000000..6e876e85 --- /dev/null +++ b/patches/opnfv-fuel/upstream-backports/0006-Restart-sshd-service-instead-of-reload.patch @@ -0,0 +1,26 @@ +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Tue, 13 Dec 2016 17:42:23 +0400 +Subject: [PATCH] Restart sshd service instead of reload + +In the middle of fuel master node bootstrap the reload of sshd service +accidentally is losing main process pid, so restart it. + +JIRA: FUEL-237 +Change-Id: I89023177e71cb6da4b9d6beff5083d345cf66db8 +Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> +--- + build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch +index 820e387..d01ce8b 100644 +--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch ++++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +@@ -41,6 +41,6 @@ index dbcac5f..1826390 100755 + -systemctl enable sshd + -systemctl start sshd +-+systemctl reload sshd +++systemctl restart sshd + + # Enable iptables + systemctl enable iptables.service |