[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 4c4cb6519ff995a77e6127b91b2510cd074468ee..5eb538f132c73eca336d970e1bf817af19f572a5 100644 (file)
--- 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 6a5c0556421bd6bf130fbd171a312695fe70e92a..14d65902e05419079072f8beea81f0be8e25cc87 100644 (file)
--- 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)