From: Owen Synge <osynge@suse.com>
Date: Thu, 24 Sep 2015 11:45:40 +0000 (+0200)
Subject: install: functions "uninstall" and "purge" merged to function "remove"
X-Git-Tag: v1.5.29~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F359%2Fhead;p=ceph-deploy.git

install: functions "uninstall" and "purge" merged to function "remove"

Before this patch functions "uninstall" and "purge" are almost identical.
Since the only difference is the logging messages, and when the
distro.uninstall() function is called a boolean parameter set both these
functions are merged into a single command "remove" with the parameter
purge.

Signed-off-by: Owen Synge <osynge@suse.com>

foo
---

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index 7758af9..8b1f545 100644
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -293,12 +293,15 @@ def install_repo(args):
 
         custom_repo(distro, args, cd_conf, rlogger, install_ceph=False)
 
-
-def uninstall(args):
+def remove(args, purge):
     LOG.info('note that some dependencies *will not* be removed because they can cause issues with qemu-kvm')
     LOG.info('like: librbd1 and librados2')
+    remove_action = 'Uninstalling'
+    if purge:
+        remove_action = 'Purging'
     LOG.debug(
-        'Uninstalling on cluster %s hosts %s',
+        '%s on cluster %s hosts %s',
+        remove_action,
         args.cluster,
         ' '.join(args.host),
         )
@@ -312,35 +315,15 @@ def uninstall(args):
             use_rhceph=True)
         LOG.info('Distro info: %s %s %s', distro.name, distro.release, distro.codename)
         rlogger = logging.getLogger(hostname)
-        rlogger.info('uninstalling Ceph on %s' % hostname)
-        distro.uninstall(distro)
+        rlogger.info('%s Ceph on %s' % (remove_action, hostname))
+        distro.uninstall(distro, purge=purge)
         distro.conn.exit()
 
+def uninstall(args):
+    remove(args, False)
 
 def purge(args):
-    LOG.info('note that some dependencies *will not* be removed because they can cause issues with qemu-kvm')
-    LOG.info('like: librbd1 and librados2')
-
-    LOG.debug(
-        'Purging from cluster %s hosts %s',
-        args.cluster,
-        ' '.join(args.host),
-        )
-
-    for hostname in args.host:
-        LOG.debug('Detecting platform for host %s ...', hostname)
-
-        distro = hosts.get(
-            hostname,
-            username=args.username,
-            use_rhceph=True
-        )
-        LOG.info('Distro info: %s %s %s', distro.name, distro.release, distro.codename)
-        rlogger = logging.getLogger(hostname)
-        rlogger.info('purging host ... %s' % hostname)
-        distro.uninstall(distro, purge=True)
-        distro.conn.exit()
-
+    remove(args, True)
 
 def purgedata(args):
     LOG.debug(