From 31c34f183e2a6e5090a48e03797eeec2eb65d40b Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 2 Aug 2011 13:05:21 -0700 Subject: [PATCH] Use "site.pp" in launch script. Depends on https://review.openstack.org/#change,128 Change-Id: I189e1f305947f64d0affe1c7c6199cde80ed8b9d --- launch_node.py | 2 +- launch_slave.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/launch_node.py b/launch_node.py index 530bcfce..0d24949f 100644 --- a/launch_node.py +++ b/launch_node.py @@ -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 diff --git a/launch_slave.py b/launch_slave.py index 51be9265..caa802c2 100644 --- a/launch_slave.py +++ b/launch_slave.py @@ -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