From 991d65e8ecb53dc6c55095f5c0ae94dbc045e4b6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 19 Aug 2012 17:50:28 -0600 Subject: [PATCH] Change puppetboot to use agent instead of apply. Change-Id: I1281e5e3a15a2cf6913b043e2a9e9d49965a1fea Reviewed-on: https://review.openstack.org/11634 Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- modules/puppetboot/files/puppetboot.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/puppetboot/files/puppetboot.conf b/modules/puppetboot/files/puppetboot.conf index 93e27c5d6c..8a888a6c3d 100644 --- a/modules/puppetboot/files/puppetboot.conf +++ b/modules/puppetboot/files/puppetboot.conf @@ -4,12 +4,8 @@ description "Applying puppet config on boot" start on runlevel[2345] script - cd /root/openstack-ci-puppet/modules - /usr/bin/git pull --ff-only - echo "Installing modules" >> /var/log/manifest.log - /bin/bash install_modules.sh >> /var/log/manifest.log echo "Running puppet on boot" >> /var/log/manifest.log date >> /var/log/manifest.log - /usr/bin/puppet apply --modulepath=/root/openstack-ci-puppet/modules -l /var/log/manifest.log /root/openstack-ci-puppet/manifests/site.pp + /usr/bin/puppet agent --test --logdest /var/log/manifest.log end script