]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
[RM-12480] fedora: don't set repo priority twice
authorTravis Rhoden <trhoden@redhat.com>
Tue, 4 Aug 2015 23:43:29 +0000 (16:43 -0700)
committerTravis Rhoden <trhoden@redhat.com>
Wed, 5 Aug 2015 18:58:18 +0000 (11:58 -0700)
For dev mode installs, fedora install() calls centos.mirror_install(),
and both these methods were setting yum repo priorities.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
ceph_deploy/hosts/fedora/install.py

index 40d3e4784ed230adbfdf9f561195df641b9548d9..6fb5d7ac1ab91adce66687f3ab998d025d2021c7 100644 (file)
@@ -56,6 +56,11 @@ def install(distro, version_kind, version, adjust_repos, **kw):
                 ]
             )
 
+            # set the right priority
+            logger.warning('ensuring that /etc/yum.repos.d/ceph.repo contains a high priority')
+            distro.conn.remote_module.set_repo_priority(['Ceph', 'Ceph-noarch', 'ceph-source'])
+            logger.warning('altered ceph.repo priorities to contain: priority=1')
+
         if version_kind == 'dev':
             logger.info('skipping install of ceph-release package')
             logger.info('repo file will be created manually')
@@ -70,11 +75,6 @@ def install(distro, version_kind, version, adjust_repos, **kw):
                 extra_installs=False
             )
 
-        # set the right priority
-        logger.warning('ensuring that /etc/yum.repos.d/ceph.repo contains a high priority')
-        distro.conn.remote_module.set_repo_priority(['Ceph', 'Ceph-noarch', 'ceph-source'])
-        logger.warning('altered ceph.repo priorities to contain: priority=1')
-
     distro.packager.install(
         packages
     )