From 0ae9d732487689eeaa7146971f7aca3a93d564c5 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 16 Jan 2013 13:45:58 +0100 Subject: [PATCH] Use openstack-config instead. Fixes bug #886177 Change-Id: Ic28a8f94f0bf3ff1ae2a60c84a630056679a062b --- packstack/plugins/serverprep_901.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packstack/plugins/serverprep_901.py b/packstack/plugins/serverprep_901.py index d61d8d507..cb5ddfccd 100644 --- a/packstack/plugins/serverprep_901.py +++ b/packstack/plugins/serverprep_901.py @@ -111,17 +111,11 @@ def serverprep(): server.append("mkdir -p %s" % basedefs.PUPPET_MANIFEST_DIR) - # lower priority of EPEL repository - # XXX: If somebody knows how to do this using sed, feel free to fix it + # set highest priority of RHOS repository if EPEL is installed server.append("rpm -q epel-release && yum install -y yum-plugin-priorities || true") - subs_cmd = ('rpm -q epel-release && python -c \'import re;' - 'f1 = open("%(repo)s"); c1 = f1.read();' - 'c2 = re.sub("enabled=1", "enabled=1\npriority=%(priority)s", c1);' - 'f2 = open("%(repo)s", "w"); f2.write(c2);' - 'f1.close(); f2.close()\' || true') - server.append(subs_cmd % {"repo": "/etc/yum.repos.d/epel.repo", - "priority": 50}) - server.append(subs_cmd % {"repo": "/etc/yum.repos.d/redhat.repo", + subs_cmd = ('rpm -q epel-release && openstack-config --set %(repo_file)s %(repo)s priority %(priority)s || true') + server.append(subs_cmd % {"repo_file": "/etc/yum.repos.d/redhat.repo", + "repo": "rhel-server-ost-6-folsom-rpms", "priority": 1}) # Add yum repositories if configured