openstack/project-config
Code Issues Proposed changes

Look for yum instead of rpm when caching devstack

Browse Source 
On CentOS 6.x the rpm executable is in /bin instead of /usr/bin, but
cache_devstack.py ends up running yum if it wants to download RPM
packages anyway. Look for yum instead of rpm as an indication of
which packages to install.

Change-Id: Iad79c0fcf66d2bd457195f007009c76f6e6aa2d2
This commit is contained in:
Jeremy Stanley
2015-05-04 02:46:46 +00:00
parent c183c33710
commit fa18656f1c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/scripts/cache_devstack.py
View File

@@ -119,7 +119,7 @@ def local_prep(distribution):
tokenize(fn, debs, distribution, comment='#') tokenize(fn, debs, distribution, comment='#')
branch_data['debs'] = debs branch_data['debs'] = debs
if os.path.exists('/usr/bin/rpm'): if os.path.exists('/usr/bin/yum'):
rpms = [] rpms = []
rpmdir = os.path.join(DEVSTACK, 'files', 'rpms') rpmdir = os.path.join(DEVSTACK, 'files', 'rpms')
for fn in os.listdir(rpmdir): for fn in os.listdir(rpmdir):