From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Thu, 19 Feb 2015 21:05:29 +0000 (-0500)
Subject: use the default_release to infer if we should use_rhceph or not
X-Git-Tag: v1.5.22-rc1~2^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c297aff9007bf290f664becf640d49671d661500;p=ceph-deploy.git

use the default_release to infer if we should use_rhceph or not

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index 3985952..2478032 100644
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -54,7 +54,13 @@ def install(args):
         distro = hosts.get(
             hostname,
             username=args.username,
-            use_rhceph=bool(getattr(args, 'use_rhceph', False)))
+            # XXX this should get removed once ceph packages are split for
+            # upstream. If default_release is True, it means that the user is
+            # trying to install on a RHEL machine and should expect to get RHEL
+            # packages. Otherwise, it will need to specify either a specific
+            # version, or repo, or a development branch.
+            use_rhceph=args.default_release,
+            )
         LOG.info(
             'Distro info: %s %s %s',
             distro.name,