From: Alfredo Deza Date: Thu, 28 Aug 2014 15:43:51 +0000 (-0400) Subject: remove the utility for yum plugin priorities X-Git-Tag: v1.5.13~3^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9d2e5ea19163e8383ce439249bc5233a4816f02;p=ceph-deploy.git remove the utility for yum plugin priorities Signed-off-by: Alfredo Deza --- diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py index 1b2776f..3cfdb10 100644 --- a/ceph_deploy/hosts/centos/install.py +++ b/ceph_deploy/hosts/centos/install.py @@ -1,5 +1,6 @@ from ceph_deploy.util import pkg_managers, templates from ceph_deploy.lib import remoto +from ceph_deploy.hosts.util import install_yum_priorities def rpm_dist(distro): @@ -146,34 +147,6 @@ def install_epel(distro): ) -def install_yum_priorities(distro): - """ - EPEL started packaging Ceph so we need to make sure that the ceph.repo we - install has a higher priority than the EPEL repo so that when installing - Ceph it will come from the repo file we create. - - The name of the package changed back and forth (!) since CentOS 4: - - From the CentOS wiki:: - - Note: This plugin has carried at least two differing names over time. - It is named yum-priorities on CentOS-5 but was named - yum-plugin-priorities on CentOS-4. CentOS-6 has reverted to - yum-plugin-priorities. - - """ - if distro.normalized_name == 'centos': - if distro.release[0] == '6': - package_name = 'yum-plugin-priorities' - else: - package_name = 'yum-priorities' - - pkg_managers.yum( - distro.conn, - package_name, - ) - - def mirror_install(distro, repo_url, gpg_url, adjust_repos, extra_installs=True): repo_url = repo_url.strip('/') # Remove trailing slashes gpg_url_path = gpg_url.split('file://')[-1] # Remove file if present