From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 30 Aug 2017 10:18:30 +0000 (+0200)
Subject: install: rpm: only one option per variable
X-Git-Tag: 1.1.0~295^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd1cef6a01d691f816ca1a3a81947f12ca80fa5c;p=teuthology.git

install: rpm: only one option per variable

Although the variables are entitled, e.g., "pkg_mng_opts" they
really can only contain at most one option. Here's what happens
when they contain more than one:

Running: "sudo zypper '-n --no-gpg-checks' install --capability --no-recommends ceph-radosgw"
stderr:Unknown option ' '
stderr:Unknown option '-'
stderr:Unknown option '-'

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/teuthology/task/install/rpm.py b/teuthology/task/install/rpm.py
index 766784a7ed..cc6c8781e9 100644
--- a/teuthology/task/install/rpm.py
+++ b/teuthology/task/install/rpm.py
@@ -132,12 +132,14 @@ def _update_package_list_and_install(ctx, remote, rpm, config):
 
     if dist_release in ['opensuse', 'sle']:
         pkg_mng_cmd = 'zypper'
-        pkg_mng_opts = '-n --no-gpg-checks'
+        pkg_mng_opts = '-n'
+        pkg_mng_gpg_opt = '--no-gpg-checks'
         pkg_mng_subcommand_opts = '--capability'
         pkg_mng_install_opts = '--no-recommends'
     else:
         pkg_mng_cmd = 'yum'
         pkg_mng_opts = '-y'
+        pkg_mng_gpg_opt = ''
         pkg_mng_subcommand_opts = ''
         pkg_mng_install_opts = ''
 
@@ -153,14 +155,14 @@ def _update_package_list_and_install(ctx, remote, rpm, config):
                       run.Raw(pkg), run.Raw(';'), 'then',
                       'sudo', pkg_mng_cmd, pkg_mng_opts, 'remove',
                       pkg_mng_subcommand_opts, pkg, run.Raw(';'),
-                      'sudo', pkg_mng_cmd, pkg_mng_opts, 'install',
+                      'sudo', pkg_mng_cmd, pkg_mng_opts, pkg_mng_gpg_opt, 'install',
                       pkg_mng_subcommand_opts, pkg_mng_install_opts,
                       pkg, run.Raw(';'),
                       'fi']
             )
         if pkg is None:
             remote.run(args=[
-                'sudo', pkg_mng_cmd, pkg_mng_opts, 'install',
+                'sudo', pkg_mng_cmd, pkg_mng_opts, pkg_mng_gpg_opt, 'install',
                 pkg_mng_subcommand_opts, pkg_mng_install_opts, cpack
             ])
         else: