From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Thu, 12 Dec 2013 19:59:17 +0000 (-0500)
Subject: all pkg_managers will take a list or a str
X-Git-Tag: v1.3.4~2^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60223fe97c547832c23ed8a318d73d447df28c86;p=ceph-deploy.git

all pkg_managers will take a list or a str

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/util/pkg_managers.py b/ceph_deploy/util/pkg_managers.py
index 45ca1f8..7e0669a 100644
--- a/ceph_deploy/util/pkg_managers.py
+++ b/ceph_deploy/util/pkg_managers.py
@@ -1,7 +1,9 @@
 from ceph_deploy.lib.remoto import process
 
 
-def apt(conn, package, *a, **kw):
+def apt(conn, packages, *a, **kw):
+    if isinstance(packages, str):
+        packages = [packages]
     cmd = [
         'env',
         'DEBIAN_FRONTEND=noninteractive',
@@ -9,8 +11,8 @@ def apt(conn, package, *a, **kw):
         '-q',
         'install',
         '--assume-yes',
-        package,
     ]
+    cmd.extend(packages)
     return process.run(
         conn,
         cmd,
@@ -20,6 +22,9 @@ def apt(conn, package, *a, **kw):
 
 
 def apt_remove(conn, packages, *a, **kw):
+    if isinstance(packages, str):
+        packages = [packages]
+
     purge = kw.pop('purge', False)
     cmd = [
         'apt-get',
@@ -54,14 +59,17 @@ def apt_update(conn):
     )
 
 
-def yum(conn, package, *a, **kw):
+def yum(conn, packages, *a, **kw):
+    if isinstance(packages, str):
+        packages = [packages]
+
     cmd = [
         'yum',
         '-y',
         '-q',
         'install',
-        package,
     ]
+    cmd.extend(packages)
     return process.run(
         conn,
         cmd,