From: Alfredo Deza <alfredo@deza.pe>
Date: Wed, 5 Aug 2015 18:47:09 +0000 (-0400)
Subject: Merge pull request #336 from trhoden/RM-12477
X-Git-Tag: v1.5.27~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f7611c1a1bc8a3905e11a6ab4b59b2dbe622fd5;p=ceph-deploy.git

Merge pull request #336 from trhoden/RM-12477

Only install priorities plugin when using Yum
---

0f7611c1a1bc8a3905e11a6ab4b59b2dbe622fd5
diff --cc ceph_deploy/hosts/fedora/install.py
index 7664ccb,f7fa546..40d3e47
--- a/ceph_deploy/hosts/fedora/install.py
+++ b/ceph_deploy/hosts/fedora/install.py
@@@ -22,13 -22,21 +22,14 @@@ def install(distro, version_kind, versi
          key = 'autobuild'
  
      if adjust_repos:
-         distro.packager.install_priorities_plugin()
-         # haven't been able to determine necessity of check_obsoletes with DNF
-         distro.conn.remote_module.enable_yum_priority_obsoletes()
-         logger.warning('check_obsoletes has been enabled for Yum priorities plugin')
+         if distro.packager.name == 'yum':
+             distro.packager.install('yum-plugin-priorities')
+             # haven't been able to determine necessity of check_obsoletes with DNF
+             distro.conn.remote_module.enable_yum_priority_obsoletes()
+             logger.warning('check_obsoletes has been enabled for Yum priorities plugin')
  
          if version_kind != 'dev':
 -            remoto.process.run(
 -                distro.conn,
 -                [
 -                    'rpm',
 -                    '--import',
 -                    gpg.url(key)
 -                ]
 -            )
 +            distro.packager.add_repo_gpg_key(gpg.url(key))
  
              if version_kind == 'stable':
                  url = 'http://ceph.com/rpm-{version}/fc{release}/'.format(