openstack/devstack-gate
Code Issues Proposed changes

Modified launch script for oneiric.

Browse Source 
Change-Id: I414967d431a691be757a32caa7034b24c7393afa
This commit is contained in:
Monty Taylor
2012-01-25 19:17:33 -05:00
parent a8db891692
commit 195211c7c1
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
launch_slave.py
View File

@@ -58,7 +58,8 @@ elif CLOUD_SERVERS_DRIVER == 'eucalyptus':
bandwidth=None, price=None, driver="")
# a simple script to install puppet post boot, can be much more complicated.
launch_script = """perl -ple 's/main/main universe/' -i /etc/apt/sources.list
if image_name == 'Ubuntu 11.04':
launch_script = """perl -ple 's/main/main universe/' -i /etc/apt/sources.list
apt-get update
apt-get -y --force-yes upgrade
apt-get install -y --force-yes git rubygems
@@ -70,6 +71,17 @@ cd openstack-ci-puppet
mv /root/slave_*_key modules/jenkins_slave/files/
/var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=`pwd`/modules manifests/site.pp
"""
elif image_name == 'Ubuntu 11.10':
launch_script = """
apt-get update
apt-get -y --force-yes upgrade
apt-get install -y --force-yes git puppet
cd /root
git clone https://review.openstack.org/p/openstack/openstack-ci-puppet.git
cd openstack-ci-puppet
mv /root/slave_*_key modules/jenkins_slave/files/
puppet apply -l /tmp/manifest.log --modulepath=`pwd`/modules manifests/site.pp
"""
# a task that first installs the ssh key, and then runs the script
if CLOUD_SERVERS_DRIVER == 'rackspace':