From: Travis Rhoden <trhoden@redhat.com>
Date: Wed, 15 Jul 2015 05:52:35 +0000 (+0000)
Subject: [RM-12259] Use DNF by default for Fedora >=22
X-Git-Tag: v1.5.26~3^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=031c1ca993a75997f12b3921a14a77947711590d;p=ceph-deploy.git

[RM-12259] Use DNF by default for Fedora >=22

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

diff --git a/ceph_deploy/hosts/fedora/install.py b/ceph_deploy/hosts/fedora/install.py
index 900fbab..6d4c12d 100644
--- a/ceph_deploy/hosts/fedora/install.py
+++ b/ceph_deploy/hosts/fedora/install.py
@@ -2,6 +2,7 @@ from ceph_deploy.lib import remoto
 from ceph_deploy.hosts.centos.install import repo_install, mirror_install  # noqa
 from ceph_deploy.hosts.util import install_yum_priorities
 from ceph_deploy.util.paths import gpg
+from ceph_deploy.util import pkg_managers
 
 
 def install(distro, version_kind, version, adjust_repos, **kw):
@@ -11,6 +12,11 @@ def install(distro, version_kind, version, adjust_repos, **kw):
     release = distro.release
     machine = distro.machine_type
 
+    if distro.normalized_release.int_major >= 22:
+        packager = pkg_managers.DNF(distro)
+    else:
+        packager = pkg_managers.Yum(distro)
+
     if version_kind in ['stable', 'testing']:
         key = 'release'
     else:
@@ -75,14 +81,9 @@ def install(distro, version_kind, version, adjust_repos, **kw):
         distro.conn.remote_module.set_repo_priority(['Ceph', 'Ceph-noarch', 'ceph-source'])
         logger.warning('altered ceph.repo priorities to contain: priority=1')
 
-    remoto.process.run(
-        distro.conn,
+    packager.install(
         [
-            'yum',
-            '-y',
-            '-q',
-            'install',
             'ceph',
-            'ceph-radosgw',
-        ],
+            'ceph-radosgw'
+        ]
     )