From: rakeshgm <rgowdege@redhat.com>
Date: Mon, 6 Apr 2020 12:19:12 +0000 (+0530)
Subject: extra_packages and extra_system_packages added to redhat install task
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1441%2Fhead;p=teuthology.git

extra_packages and extra_system_packages added to redhat install task

Signed-off-by: rakeshgm <rgowdege@redhat.com>
---

diff --git a/teuthology/task/install/__init__.py b/teuthology/task/install/__init__.py
index d8f027a54..f68471540 100644
--- a/teuthology/task/install/__init__.py
+++ b/teuthology/task/install/__init__.py
@@ -568,9 +568,7 @@ def task(ctx, config):
                 0,
                 lambda: ansible.CephLab(ctx, config=ansible_config)
             )
-        nested_config = dict(extra_system_packages=config.get('extra_system_packages', []),
-                             extra_packages=config.get('extra_packages', []),
-                             )
+
         with contextutil.nested(*nested_tasks):
                 yield
     else:
diff --git a/teuthology/task/install/redhat.py b/teuthology/task/install/redhat.py
index 722cd99fc..08568bda8 100644
--- a/teuthology/task/install/redhat.py
+++ b/teuthology/task/install/redhat.py
@@ -57,6 +57,10 @@ def install(ctx, config):
     log.info("using yaml path %s", yaml_path)
     downstream_config = yaml.safe_load(open(yaml_path))
     rh_versions = downstream_config.get('versions', dict()).get('supported', [])
+    external_config = dict(extra_system_packages=config.get('extra_system_packages', {}),
+                           extra_packages=config.get('extra_packages', {}),
+                           )
+    downstream_config.update(external_config)
     version = config['rhbuild']
     if version in rh_versions:
         log.info("%s is a supported version", version)
@@ -91,7 +95,9 @@ def install_pkgs(ctx, remote, version, downstream_config):
     :param downstream_config the dict object that has downstream pkg info
     """
     rh_version_check = downstream_config.get('versions').get('rpm').get('mapped')
-    rh_rpm_pkgs = downstream_config.get('pkgs').get('rpm')
+    rh_rpm_pkgs = downstream_config.get('pkgs').get('rpm') + \
+                  downstream_config.get('extra_system_packages').get('rpm', []) + \
+                  downstream_config.get('extra_packages').get('rpm', [])
     pkgs = str.join(' ', rh_rpm_pkgs)
     log.info("Remove any epel packages installed on node %s", remote.shortname)
     # below packages can come from epel and still work, ensure we use cdn pkgs
@@ -103,6 +109,7 @@ def install_pkgs(ctx, remote, version, downstream_config):
             run.Raw("leveldb xmlstarlet fcgi"),
             '-y'],
         check_status=False)
+
     log.info("Installing redhat ceph packages")
     remote.run(args=['sudo', 'yum', '-y', 'install',
                      run.Raw(pkgs)])
@@ -165,7 +172,9 @@ def install_deb_pkgs(
     : param downstream_config the dict object that has downstream pkg info
     """
     rh_version_check = downstream_config.get('versions').get('deb').get('mapped')
-    rh_deb_pkgs = downstream_config.get('pkgs').get('deb')
+    rh_deb_pkgs = downstream_config.get('pkgs').get('deb') + \
+                  downstream_config.get('extra_system_packages').get('deb', []) + \
+                  downstream_config.get('extra_packages').get('deb', [])
     pkgs = str.join(' ', rh_deb_pkgs)
     log.info("Installing redhat ceph packages")
     remote.run(args=['sudo', 'apt-get', '-y', 'install',