From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Mar 2015 23:44:21 +0000 (-0700)
Subject: install: install/uninstall radosgw package too
X-Git-Tag: v1.5.23~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc28f034301c07e1f966b4e13a828c0a11b1bb06;p=ceph-deploy.git

install: install/uninstall radosgw package too

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index ca10d73..1ba388a 100644
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -109,6 +109,7 @@ def install(distro, version_kind, version, adjust_repos):
             '-y',
             'install',
             'ceph',
+            'radosgw',
         ],
     )
 
diff --git a/ceph_deploy/hosts/centos/uninstall.py b/ceph_deploy/hosts/centos/uninstall.py
index 9af8c13..1f43e3b 100644
--- a/ceph_deploy/hosts/centos/uninstall.py
+++ b/ceph_deploy/hosts/centos/uninstall.py
@@ -6,6 +6,7 @@ def uninstall(conn, purge=False):
         'ceph',
         'ceph-release',
         'ceph-common',
+        'radosgw',
         ]
 
     pkg_managers.yum_remove(
diff --git a/ceph_deploy/hosts/debian/install.py b/ceph_deploy/hosts/debian/install.py
index b6a89e8..b59f108 100644
--- a/ceph_deploy/hosts/debian/install.py
+++ b/ceph_deploy/hosts/debian/install.py
@@ -91,6 +91,7 @@ def install(distro, version_kind, version, adjust_repos):
             'ceph-mds',
             'ceph-common',
             'ceph-fs-common',
+            'radosgw',
             # ceph only recommends gdisk, make sure we actually have
             # it; only really needed for osds, but minimal collateral
             'gdisk',
diff --git a/ceph_deploy/hosts/debian/uninstall.py b/ceph_deploy/hosts/debian/uninstall.py
index 98c45fb..ce2013f 100644
--- a/ceph_deploy/hosts/debian/uninstall.py
+++ b/ceph_deploy/hosts/debian/uninstall.py
@@ -7,6 +7,7 @@ def uninstall(conn, purge=False):
         'ceph-mds',
         'ceph-common',
         'ceph-fs-common',
+        'radosgw',
         ]
     pkg_managers.apt_remove(
         conn,
diff --git a/ceph_deploy/hosts/fedora/install.py b/ceph_deploy/hosts/fedora/install.py
index a6f4385..bf9fe70 100644
--- a/ceph_deploy/hosts/fedora/install.py
+++ b/ceph_deploy/hosts/fedora/install.py
@@ -80,5 +80,6 @@ def install(distro, version_kind, version, adjust_repos):
             '-q',
             'install',
             'ceph',
+            'radosgw',
         ],
     )
diff --git a/ceph_deploy/hosts/fedora/uninstall.py b/ceph_deploy/hosts/fedora/uninstall.py
index 2a31549..f1f07b8 100644
--- a/ceph_deploy/hosts/fedora/uninstall.py
+++ b/ceph_deploy/hosts/fedora/uninstall.py
@@ -5,6 +5,7 @@ def uninstall(conn, purge=False):
     packages = [
         'ceph',
         'ceph-common',
+        'radosgw',
         ]
 
     pkg_managers.yum_remove(
diff --git a/ceph_deploy/hosts/rhel/install.py b/ceph_deploy/hosts/rhel/install.py
index c65b10c..83b540c 100644
--- a/ceph_deploy/hosts/rhel/install.py
+++ b/ceph_deploy/hosts/rhel/install.py
@@ -75,4 +75,4 @@ def repo_install(distro, reponame, baseurl, gpgkey, **kw):
 
     # Some custom repos do not need to install ceph
     if install_ceph:
-        pkg_managers.yum(distro.conn, ['ceph', 'ceph-mon', 'ceph-osd'])
+        pkg_managers.yum(distro.conn, ['ceph', 'ceph-mon', 'ceph-osd', 'radosgw'])
diff --git a/ceph_deploy/hosts/rhel/uninstall.py b/ceph_deploy/hosts/rhel/uninstall.py
index 432d441..d5a7ba1 100644
--- a/ceph_deploy/hosts/rhel/uninstall.py
+++ b/ceph_deploy/hosts/rhel/uninstall.py
@@ -6,7 +6,8 @@ def uninstall(conn, purge=False):
         'ceph',
         'ceph-common',
         'ceph-mon',
-        'ceph-osd'
+        'ceph-osd',
+        'radosgw'
         ]
 
     pkg_managers.yum_remove(
diff --git a/ceph_deploy/hosts/suse/install.py b/ceph_deploy/hosts/suse/install.py
index 4efb492..65f1177 100644
--- a/ceph_deploy/hosts/suse/install.py
+++ b/ceph_deploy/hosts/suse/install.py
@@ -80,6 +80,7 @@ def install(distro, version_kind, version, adjust_repos):
             '--quiet',
             'install',
             'ceph',
+            'radosgw',
             ],
         )
 
diff --git a/ceph_deploy/hosts/suse/uninstall.py b/ceph_deploy/hosts/suse/uninstall.py
index 9d815e7..c3b742d 100644
--- a/ceph_deploy/hosts/suse/uninstall.py
+++ b/ceph_deploy/hosts/suse/uninstall.py
@@ -7,6 +7,7 @@ def uninstall(conn, purge=False):
         'libcephfs1',
         'librados2',
         'librbd1',
+        'radosgw',
         ]
     cmd = [
         'zypper',