From 023084549e863eab98a825c3ede9096e5f2289fc Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 14 Jul 2011 14:18:25 -0400 Subject: [PATCH] Let's use the gem installed puppet. --- launch_node.py | 2 +- launch_slave.py | 2 +- node_needs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/launch_node.py b/launch_node.py index 8f9c77fc..550386e6 100644 --- a/launch_node.py +++ b/launch_node.py @@ -24,7 +24,7 @@ apt-get install -y --force-yes git rubygems gem install puppet git clone git://github.com/openstack/openstack-ci-puppet.git cd openstack-ci-puppet -puppet apply --modulepath=`pwd`/modules manifests/server.pp +/var/lib/gems/1.8/bin/puppet apply --modulepath=`pwd`/modules manifests/server.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 1285ef48..7d97d618 100644 --- a/launch_slave.py +++ b/launch_slave.py @@ -24,7 +24,7 @@ apt-get install -y --force-yes git rubygems gem install puppet git clone git://github.com/openstack/openstack-ci-puppet.git cd openstack-ci-puppet -puppet apply --modulepath=`pwd`/modules manifests/slave.pp +/var/lib/gems/1.8/bin/puppet apply --modulepath=`pwd`/modules manifests/slave.pp """) # a task that first installs the ssh key, and then runs the script diff --git a/node_needs b/node_needs index 5897cc26..de65ee60 100644 --- a/node_needs +++ b/node_needs @@ -1,2 +1,2 @@ nova: add-apt-repository ppa:nova-core/trunk ; apt-get update ; apt-get -build-dep nova ; easy_install nosexcover +build-dep nova