[RM-12480] debian: use extra_remove_flags instead of purge flag

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

diff --git a/ceph_deploy/hosts/debian/uninstall.py b/ceph_deploy/hosts/debian/uninstall.py
index 42d0ce42e46d8061bb3cc78488c5d6be6e1d49a8..b3a01b29cb4564868ff14336187773d7a9105787 100644 (file)
--- a/ceph_deploy/hosts/debian/uninstall.py
+++ b/ceph_deploy/hosts/debian/uninstall.py
@@ -6,7 +6,10 @@ def uninstall(distro, purge=False):
         'ceph-fs-common',
         'radosgw',
         ]
+    extra_remove_flags = []
+    if purge:
+        extra_remove_flags.append('--purge')
     distro.packager.remove(
         packages,
-        purge=purge,
+        extra_remove_flags=extra_remove_flags
     )

diff --git a/ceph_deploy/util/pkg_managers.py b/ceph_deploy/util/pkg_managers.py
index 8b13677d4eb3ad534295d935160dc45ab0afd67d..385c05b2adc7605753d506e88b7d69514a20b530 100644 (file)
--- a/ceph_deploy/util/pkg_managers.py
+++ b/ceph_deploy/util/pkg_managers.py
@@ -382,7 +382,7 @@ class Apt(PackageManager):
         cmd.extend(packages)
         return self._run(cmd)
 
-    def remove(self, packages, purge=False, **kw):
+    def remove(self, packages, **kw):
         if isinstance(packages, str):
             packages = [packages]
 
@@ -397,8 +397,6 @@ class Apt(PackageManager):
                 extra_flags = [extra_flags]
             cmd.extend(extra_flags)
 
-        if purge:
-            cmd.append('--purge')
         cmd.extend(packages)
         return self._run(cmd)