From: Vasu Kulkarni <vasu@redhat.com>
Date: Fri, 24 Jun 2016 19:57:33 +0000 (-0700)
Subject: [BZ-1349999] Handle package split for ubuntu
X-Git-Tag: v1.5.35~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dff1f0436659769105d72b3c1b5bcb492d20fe9c;p=ceph-deploy.git

[BZ-1349999] Handle package split for ubuntu

ceph is now split into ceph-base, ceph-mon and ceph-osd

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/ceph_deploy/hosts/debian/install.py b/ceph_deploy/hosts/debian/install.py
index 2f7a882..672789a 100644
--- a/ceph_deploy/hosts/debian/install.py
+++ b/ceph_deploy/hosts/debian/install.py
@@ -4,17 +4,10 @@ except ImportError:
     from urlparse import urlparse
 
 from ceph_deploy.util.paths import gpg
-from ceph_deploy.hosts.common import map_components
-
-
-NON_SPLIT_COMPONENTS = ['ceph-osd', 'ceph-mon']
 
 
 def install(distro, version_kind, version, adjust_repos, **kw):
-    packages = map_components(
-        NON_SPLIT_COMPONENTS,
-        kw.pop('components', [])
-    )
+    packages = kw.pop('components', [])
     codename = distro.codename
     machine = distro.machine_type
 
@@ -67,10 +60,7 @@ def install(distro, version_kind, version, adjust_repos, **kw):
 
 
 def mirror_install(distro, repo_url, gpg_url, adjust_repos, **kw):
-    packages = map_components(
-        NON_SPLIT_COMPONENTS,
-        kw.pop('components', [])
-    )
+    packages = kw.pop('components', [])
     repo_url = repo_url.strip('/')  # Remove trailing slashes
 
     if adjust_repos:
@@ -88,10 +78,7 @@ def mirror_install(distro, repo_url, gpg_url, adjust_repos, **kw):
 
 
 def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
-    packages = map_components(
-        NON_SPLIT_COMPONENTS,
-        kw.pop('components', [])
-    )
+    packages = kw.pop('components', [])
     # Get some defaults
     safe_filename = '%s.list' % repo_name.replace(' ', '-')
     install_ceph = kw.pop('install_ceph', False)