From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 20 Jul 2017 13:38:01 +0000 (+0000)
Subject: qa/tasks/keystone: make possible to deploy Keystone on CentOS as well.
X-Git-Tag: v13.0.0~39^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3dbacd1387c68de61f9ef6f3d7931f65da3eb845;p=ceph.git

qa/tasks/keystone: make possible to deploy Keystone on CentOS as well.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/qa/tasks/keystone.py b/qa/tasks/keystone.py
index 7dcffe1268a5..1cefa1066cfc 100644
--- a/qa/tasks/keystone.py
+++ b/qa/tasks/keystone.py
@@ -27,17 +27,14 @@ def install_packages(ctx, config):
     assert isinstance(config, dict)
     log.info('Installing packages for Keystone...')
 
-    deps = [
-        'libffi-dev',
-        'libssl-dev',
-        'libldap2-dev',
-        'libsasl2-dev',
-        'python-openstackclient'
-    ]
+    deps = {
+	'deb': [ 'libffi-dev', 'libssl-dev', 'libldap2-dev', 'libsasl2-dev' ],
+	'rpm': [ 'libffi-devel', 'openssl-devel' ],
+    }
     for (client, _) in config.items():
         (remote,) = ctx.cluster.only(client).remotes.iterkeys()
-        for pkgname in deps:
-            install_package(pkgname, remote)
+        for dep in deps[remote.os.package_type]:
+            install_package(dep, remote)
     try:
         yield
     finally:
@@ -45,8 +42,8 @@ def install_packages(ctx, config):
 
         for (client, _) in config.items():
             (remote,) = ctx.cluster.only(client).remotes.iterkeys()
-            for pkgname in deps:
-                remove_package(pkgname, remote)
+            for dep in deps[remote.os.package_type]:
+                remove_package(dep, remote)
 
 @contextlib.contextmanager
 def download(ctx, config):
@@ -126,6 +123,9 @@ def setup_venv(ctx, config):
                 run.Raw('&&'),
                 'tox', '-e', 'venv', '--notest'
             ])
+
+        run_in_keystone_venv(ctx, client,
+            [   'pip', 'install', 'python-openstackclient' ])
     try:
         yield
     finally:
diff --git a/qa/tasks/tox.py b/qa/tasks/tox.py
index 38bd4efe6972..46b4f565dc06 100644
--- a/qa/tasks/tox.py
+++ b/qa/tasks/tox.py
@@ -36,7 +36,7 @@ def task(ctx, config):
         ctx.cluster.only(client).run(args=
             [   'source', '{tvdir}/bin/activate'.format(tvdir=tvdir),
                 run.Raw('&&'),
-                'pip', 'install', 'tox'
+                'pip', 'install', 'tox==2.3.1'
             ])
 
     # export the path Keystone and Tempest