From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Mon, 22 Oct 2018 19:58:16 +0000 (+0200)
Subject: openstack: fix pulpito and paddles status in init script
X-Git-Tag: 1.1.0~211^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a860891e09a4df179a98363a159d590c95ba1744;p=teuthology.git

openstack: fix pulpito and paddles status in init script

After deployment teuthology cluster on openstack, teuthology
service status-paddles and status-pulpito commands report
'dead', however paddles and pulpito are running.
This fix addresses this issue.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.de>
---

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 908991c81..e40e4f47b 100644
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -1122,7 +1122,12 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
                 "{user} >> /tmp/init.out "
                 "2>&1".format(user=self.username,
                               opts=' '.join(setup_options + all_options))),
-            "/etc/init.d/teuthology restart"
+            # wa: we want to stop paddles and pulpito started by
+            # setup-openstack before starting teuthology service
+            "pkill -f 'pecan serve'",
+            "pkill -f 'python run.py'",
+            "systemctl enable teuthology",
+            "systemctl start teuthology",
         ]
         if cacert_cmd:
             cmds.insert(0,cmd_str(cacert_cmd))