From e678179c9d98c7372626ab43dbc97ffe2cc86c83 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Thu, 17 Mar 2016 17:33:08 -0400 Subject: [PATCH] Add ceph-selinux to pkg list for 1.3.2 builds Signed-off-by: Vasu Kulkarni --- teuthology/task/install.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index ebdea14547..f92aeb60ca 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -732,12 +732,14 @@ def rh_install_pkgs(ctx, remote, installed_version): :param remote: the teuthology.orchestra.remote.Remote object """ pkgs = ['ceph-deploy'] + if (installed_version == '1.3.2'): + pkgs.append('ceph-selinux') rh_version_check = {'0.94.1': '1.3.0', '0.94.3': '1.3.1', '0.94.5': '1.3.2', '10.0.4': '2.0'} log.info("Remove any epel packages installed on node %s", remote.shortname) remote.run(args=['sudo', 'yum', 'remove', run.Raw("leveldb xmlstarlet fcgi"), '-y'],check_status=False) for pkg in pkgs: - log.info("Check if ceph-deploy is already installed on node %s", remote.shortname) + log.info("Check if %s is already installed on node %s", pkg, remote.shortname) remote.run(args=['sudo', 'yum', 'clean', 'metadata']) r = remote.run( args=['yum', 'list', 'installed', run.Raw(pkg)], @@ -748,7 +750,7 @@ def rh_install_pkgs(ctx, remote, installed_version): log.info("Installing %s " % pkg) remote.run(args=['sudo', 'yum', 'install', pkg, '-y']) else: - log.info("Removing and reinstalling ceph-deploy on %s", remote.shortname) + log.info("Removing and reinstalling %s on %s", pkg, remote.shortname) remote.run(args=['sudo', 'yum', 'remove', pkg, '-y']) remote.run(args=['sudo', 'yum', 'install', pkg, '-y']) -- 2.39.5