]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
Merge pull request #336 from trhoden/RM-12477
authorAlfredo Deza <alfredo@deza.pe>
Wed, 5 Aug 2015 18:47:09 +0000 (14:47 -0400)
committerAlfredo Deza <alfredo@deza.pe>
Wed, 5 Aug 2015 18:47:09 +0000 (14:47 -0400)
Only install priorities plugin when using Yum

1  2 
ceph_deploy/hosts/centos/install.py
ceph_deploy/hosts/fedora/install.py
ceph_deploy/util/pkg_managers.py

Simple merge
index 7664ccbee2a387b90e16ae12b5d4fcb23f802636,f7fa54634bc61861f7b86f9d118d858867ee648b..40d3e4784ed230adbfdf9f561195df641b9548d9
@@@ -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(
Simple merge