openstack/devstack-gate
Code Issues Proposed changes

Merge "Use "site.pp" in launch script."

Browse Source
This commit is contained in:
Jenkins
2011-08-02 21:07:17 +00:00
committed by Gerrit Code Review
parent 62bc463115 31c34f183e
commit be25c2ae91
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launch_node.py
View File

@@ -24,7 +24,7 @@ apt-get install -y --force-yes git rubygems
gem install --no-rdoc --no-ri puppet
git clone git://github.com/openstack/openstack-ci-puppet.git
cd openstack-ci-puppet
/var/lib/gems/1.8/bin/puppet apply --modulepath=`pwd`/modules manifests/server.pp
/var/lib/gems/1.8/bin/puppet apply --modulepath=`pwd`/modules manifests/site.pp
""")
# a task that first installs the ssh key, and then runs the script

3
launch_slave.py
View File

@@ -48,8 +48,7 @@ gem install --no-rdoc --no-ri puppet
git clone git://github.com/openstack/openstack-ci-puppet.git
cd openstack-ci-puppet
mv /root/slave_*_key modules/jenkins_slave/files/
ln -sf /root/openstack-ci-puppet/manifests/%s.pp manifests/this.pp
/var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=`pwd`/modules manifests/this.pp
/var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=`pwd`/modules manifests/site.pp
""" % node_manifest)
# a task that first installs the ssh key, and then runs the script