From: Travis Rhoden <trhoden@redhat.com>
Date: Wed, 5 Aug 2015 00:02:14 +0000 (-0700)
Subject: [RM-12480] debian: Pass extra install args consistently
X-Git-Tag: v1.5.27~2^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99a0ea8bc17ecb6635a1748bedec06151f65b142;p=ceph-deploy.git

[RM-12480] debian: Pass extra install args consistently

I should be using **kw more to handle these optional items.
Make Apt consistent with RPM now.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
---

diff --git a/ceph_deploy/hosts/debian/install.py b/ceph_deploy/hosts/debian/install.py
index 4c4cb65..5eb538f 100644
--- a/ceph_deploy/hosts/debian/install.py
+++ b/ceph_deploy/hosts/debian/install.py
@@ -53,7 +53,10 @@ def install(distro, version_kind, version, adjust_repos, **kw):
 
     # TODO this does not downgrade -- should it?
     if packages:
-        distro.packager.install(packages, force_confnew=True)
+        distro.packager.install(
+            packages,
+            extra_install_flags=['-o', 'Dpkg::Options::=--force-confnew']
+        )
 
 
 def mirror_install(distro, repo_url, gpg_url, adjust_repos, **kw):
diff --git a/ceph_deploy/util/pkg_managers.py b/ceph_deploy/util/pkg_managers.py
index 6a5c055..14d6590 100644
--- a/ceph_deploy/util/pkg_managers.py
+++ b/ceph_deploy/util/pkg_managers.py
@@ -360,7 +360,7 @@ class Apt(PackageManager):
     ]
     name = 'apt'
 
-    def install(self, packages, force_confnew=False, **kw):
+    def install(self, packages, **kw):
         if isinstance(packages, str):
             packages = [packages]
 
@@ -374,8 +374,6 @@ class Apt(PackageManager):
             if isinstance(extra_flags, str):
                 extra_flags = [extra_flags]
             cmd.extend(extra_flags)
-        if force_confnew:
-            cmd.extend(['-o', 'Dpkg::Options::=--force-confnew'])
         cmd.extend(packages)
         return self._run(cmd)