From: Travis Rhoden Date: Tue, 4 Aug 2015 23:43:29 +0000 (-0700) Subject: [RM-12480] fedora: don't set repo priority twice X-Git-Tag: v1.5.27~2^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38c32f55061473048af428d90f4c76ad75ecc9b8;p=ceph-deploy.git [RM-12480] fedora: don't set repo priority twice For dev mode installs, fedora install() calls centos.mirror_install(), and both these methods were setting yum repo priorities. Signed-off-by: Travis Rhoden --- diff --git a/ceph_deploy/hosts/fedora/install.py b/ceph_deploy/hosts/fedora/install.py index 40d3e47..6fb5d7a 100644 --- a/ceph_deploy/hosts/fedora/install.py +++ b/ceph_deploy/hosts/fedora/install.py @@ -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 )