From b15d4b2dc5a936052a7477a9c6ace3ac38e81dd1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 4 Mar 2014 14:23:21 -0300
Subject: Updating for puppet-bootstrap compatibility

---
 share/hydractl/bootstrap | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'share')

diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
index 3821dd7..0d60b50 100755
--- a/share/hydractl/bootstrap
+++ b/share/hydractl/bootstrap
@@ -23,11 +23,14 @@ if [ "$STAGE" == "repository" ]; then
 
   if [ ! -d "/etc/puppet/.git" ]; then
     rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet
-    chown -R puppet. /etc/puppet
     hydra_bootstrap_config /etc/puppet
+    chown -R puppet. /etc/puppet
   fi
 fi
 
 if [ -e "/etc/puppet/manifests/$stage.pp" ]; then
-  puppet apply /etc/puppet/manifests/$stage.pp
+  (
+    cd /etc/puppet
+    make apply stage=$stage
+  )
 fi
-- 
cgit v1.2.3