From: Travis Rhoden <trhoden@redhat.com>
Date: Fri, 7 Aug 2015 22:01:51 +0000 (-0700)
Subject: [RM-12644] Kill duplicate pkg mgmt code
X-Git-Tag: v1.5.28~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F342%2Fhead;p=ceph-deploy.git

[RM-12644] Kill duplicate pkg mgmt code

Ah, payoff!  Feels nice.

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

diff --git a/ceph_deploy/hosts/centos/__init__.py b/ceph_deploy/hosts/centos/__init__.py
index 64e3ed2..0b8cb6b 100644
--- a/ceph_deploy/hosts/centos/__init__.py
+++ b/ceph_deploy/hosts/centos/__init__.py
@@ -1,5 +1,4 @@
 import mon  # noqa
-import pkg  # noqa
 from install import install, mirror_install, repo_install, repository_url_part, rpm_dist  # noqa
 from uninstall import uninstall  # noqa
 from ceph_deploy.util import pkg_managers
diff --git a/ceph_deploy/hosts/centos/pkg.py b/ceph_deploy/hosts/centos/pkg.py
deleted file mode 100644
index eb02bfd..0000000
--- a/ceph_deploy/hosts/centos/pkg.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from ceph_deploy.util import pkg_managers
-
-
-def install(distro, packages):
-    return pkg_managers.yum(
-        distro.conn,
-        packages
-    )
-
-
-def remove(distro, packages):
-    return pkg_managers.yum_remove(
-        distro.conn,
-        packages
-    )
diff --git a/ceph_deploy/hosts/debian/__init__.py b/ceph_deploy/hosts/debian/__init__.py
index d3b472f..2c087dd 100644
--- a/ceph_deploy/hosts/debian/__init__.py
+++ b/ceph_deploy/hosts/debian/__init__.py
@@ -1,5 +1,4 @@
 import mon  # noqa
-import pkg  # noqa
 from install import install, mirror_install, repo_install  # noqa
 from uninstall import uninstall  # noqa
 from ceph_deploy.util import pkg_managers
diff --git a/ceph_deploy/hosts/debian/pkg.py b/ceph_deploy/hosts/debian/pkg.py
deleted file mode 100644
index 40a94da..0000000
--- a/ceph_deploy/hosts/debian/pkg.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from ceph_deploy.util import pkg_managers
-
-
-def install(distro, packages):
-    return pkg_managers.apt(
-        distro.conn,
-        packages
-    )
-
-
-def remove(distro, packages):
-    return pkg_managers.apt_remove(
-        distro.conn,
-        packages
-    )
diff --git a/ceph_deploy/hosts/fedora/__init__.py b/ceph_deploy/hosts/fedora/__init__.py
index 990adc1..9de01bb 100644
--- a/ceph_deploy/hosts/fedora/__init__.py
+++ b/ceph_deploy/hosts/fedora/__init__.py
@@ -1,5 +1,4 @@
 import mon  # noqa
-from ceph_deploy.hosts.centos import pkg  # noqa
 from ceph_deploy.hosts.centos.install import repo_install  # noqa
 from install import install, mirror_install  # noqa
 from uninstall import uninstall  # noqa
diff --git a/ceph_deploy/hosts/rhel/__init__.py b/ceph_deploy/hosts/rhel/__init__.py
index 96582fa..f32c46a 100644
--- a/ceph_deploy/hosts/rhel/__init__.py
+++ b/ceph_deploy/hosts/rhel/__init__.py
@@ -1,5 +1,4 @@
 import mon  # noqa
-import pkg  # noqa
 from install import install, mirror_install, repo_install  # noqa
 from uninstall import uninstall  # noqa
 from ceph_deploy.util import pkg_managers
diff --git a/ceph_deploy/hosts/rhel/pkg.py b/ceph_deploy/hosts/rhel/pkg.py
deleted file mode 100644
index eb02bfd..0000000
--- a/ceph_deploy/hosts/rhel/pkg.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from ceph_deploy.util import pkg_managers
-
-
-def install(distro, packages):
-    return pkg_managers.yum(
-        distro.conn,
-        packages
-    )
-
-
-def remove(distro, packages):
-    return pkg_managers.yum_remove(
-        distro.conn,
-        packages
-    )
diff --git a/ceph_deploy/hosts/suse/__init__.py b/ceph_deploy/hosts/suse/__init__.py
index 6d5d73e..e66a433 100644
--- a/ceph_deploy/hosts/suse/__init__.py
+++ b/ceph_deploy/hosts/suse/__init__.py
@@ -1,5 +1,4 @@
 import mon  # noqa
-import pkg  # noqa
 from install import install, mirror_install, repo_install  # noqa
 from uninstall import uninstall  # noqa
 import logging
diff --git a/ceph_deploy/hosts/suse/pkg.py b/ceph_deploy/hosts/suse/pkg.py
deleted file mode 100644
index da43279..0000000
--- a/ceph_deploy/hosts/suse/pkg.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from ceph_deploy.util import pkg_managers
-
-
-def install(distro, packages):
-    return pkg_managers.zypper(
-        distro.conn,
-        packages
-    )
-
-
-def remove(distro, packages):
-    return pkg_managers.zypper_remove(
-        distro.conn,
-        packages
-    )
diff --git a/ceph_deploy/util/pkg_managers.py b/ceph_deploy/util/pkg_managers.py
index 385c05b..0cbb088 100644
--- a/ceph_deploy/util/pkg_managers.py
+++ b/ceph_deploy/util/pkg_managers.py
@@ -5,184 +5,6 @@ from ceph_deploy.lib import remoto
 from ceph_deploy.util import templates
 
 
-def apt(conn, packages, *a, **kw):
-    if isinstance(packages, str):
-        packages = [packages]
-    cmd = [
-        'env',
-        'DEBIAN_FRONTEND=noninteractive',
-        'apt-get',
-        'install',
-        '--assume-yes',
-    ]
-    cmd.extend(packages)
-    return remoto.process.run(
-        conn,
-        cmd,
-        *a,
-        **kw
-    )
-
-
-def apt_remove(conn, packages, *a, **kw):
-    if isinstance(packages, str):
-        packages = [packages]
-
-    purge = kw.pop('purge', False)
-    cmd = [
-        'apt-get',
-        '-q',
-        'remove',
-        '-f',
-        '-y',
-        '--force-yes',
-    ]
-    if purge:
-        cmd.append('--purge')
-    cmd.extend(packages)
-
-    return remoto.process.run(
-        conn,
-        cmd,
-        *a,
-        **kw
-    )
-
-
-def apt_update(conn):
-    cmd = [
-        'apt-get',
-        '-q',
-        'update',
-    ]
-    return remoto.process.run(
-        conn,
-        cmd,
-    )
-
-
-def yum(conn, packages, *a, **kw):
-    if isinstance(packages, str):
-        packages = [packages]
-
-    cmd = [
-        'yum',
-        '-y',
-        'install',
-    ]
-    cmd.extend(packages)
-    return remoto.process.run(
-        conn,
-        cmd,
-        *a,
-        **kw
-    )
-
-
-def yum_remove(conn, packages, *a, **kw):
-    cmd = [
-        'yum',
-        '-y',
-        '-q',
-        'remove',
-    ]
-    if isinstance(packages, str):
-        cmd.append(packages)
-    else:
-        cmd.extend(packages)
-    return remoto.process.run(
-        conn,
-        cmd,
-        *a,
-        **kw
-    )
-
-
-def yum_clean(conn, item=None):
-    item = item or 'all'
-    cmd = [
-        'yum',
-        'clean',
-        item,
-    ]
-
-    return remoto.process.run(
-        conn,
-        cmd,
-    )
-
-
-def rpm(conn, rpm_args=None, *a, **kw):
-    """
-    A minimal front end for ``rpm`. Extra flags can be passed in via
-    ``rpm_args`` as an iterable.
-    """
-    rpm_args = rpm_args or []
-    cmd = [
-        'rpm',
-        '-Uvh',
-    ]
-    cmd.extend(rpm_args)
-    return remoto.process.run(
-        conn,
-        cmd,
-        *a,
-        **kw
-    )
-
-
-def zypper(conn, packages, *a, **kw):
-    if isinstance(packages, str):
-        packages = [packages]
-
-    cmd = [
-        'zypper',
-        '--non-interactive',
-        'install',
-    ]
-
-    cmd.extend(packages)
-    return remoto.process.run(
-        conn,
-        cmd,
-        *a,
-        **kw
-    )
-
-
-def zypper_remove(conn, packages, *a, **kw):
-    cmd = [
-        'zypper',
-        '--non-interactive',
-        '--quiet',
-        'remove',
-        ]
-
-    if isinstance(packages, str):
-        cmd.append(packages)
-    else:
-        cmd.extend(packages)
-    return remoto.process.run(
-        conn,
-        cmd,
-        *a,
-        **kw
-    )
-
-
-def zypper_refresh(conn):
-    cmd = [
-        'zypper',
-        '--non-interactive',
-        'refresh',
-        ]
-
-    return remoto.process.run(
-        conn,
-        cmd
-    )
-
-
 class PackageManager(object):
     """
     Base class for all Package Managers