opendev/system-config
Code Issues Proposed changes

Merge "Update devstack-cache.py to install RPMs."

Browse Source
This commit is contained in:
Jenkins 2013-11-27 16:44:46 +00:00 committed by Gerrit Code Review
commit d1c2943a99
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/openstack_project/files/nodepool/scripts/devstack-cache.py
View File

@ -73,12 +73,21 @@ def local_prep(distribution):
run_local(['git', 'checkout', branch], cwd=DEVSTACK)
run_local(['git', 'pull', '--ff-only', 'origin'], cwd=DEVSTACK)
debs = []
debdir = os.path.join(DEVSTACK, 'files', 'apts')
for fn in os.listdir(debdir):
fn = os.path.join(debdir, fn)
tokenize(fn, debs, distribution, comment='#')
branch_data['debs'] = debs
if os.path.exists('/usr/bin/apt-get'):
debs = []
debdir = os.path.join(DEVSTACK, 'files', 'apts')
for fn in os.listdir(debdir):
fn = os.path.join(debdir, fn)
tokenize(fn, debs, distribution, comment='#')
branch_data['debs'] = debs
if os.path.exists('/usr/bin/rpm'):
rpms = []
rpmdir = os.path.join(DEVSTACK, 'files', 'rpms')
for fn in os.listdir(rpmdir):
fn = os.path.join(rpmdir, fn)
tokenize(fn, rpms, distribution, comment='#')
branch_data['rpms'] = rpms
images = []
for line in open(os.path.join(DEVSTACK, 'stackrc')):
@ -111,6 +120,10 @@ def main():
run_local(['sudo', 'apt-get', '-y', '-d', 'install'] +
branch_data['debs'])
if branch_data['rpms']:
run_local(['sudo', 'yum', 'install', '-y', '--downloadonly'] +
branch_data['rpms'])
for url in branch_data['images']:
fname = url.split('/')[-1]
if fname in image_filenames: