Updating for puppet-bootstrap compatibility

diff --git a/README.md b/README.md
index 12bc4cea6a3d1051b61e6447d995cf35163a0ebb..c720ca8a8d79faa23978b8ca90324a8296a28ecf 100644 (file)
--- a/README.md
+++ b/README.md
@@ -37,5 +37,5 @@ Creating a new network
 
 To create the needed repositories to start a new network, use a similar command:
 
-    hydra example init ~/file/example
+    hydra example init   ~/file/example
     hydra example config domain example.org

diff --git a/lib/hydra/config b/lib/hydra/config
index 8dbda891604a6755aaea1d4e3faa22eb695373d4..fe7606e49a666b9838eecb4e6d375e53e317982b 100644 (file)
--- a/lib/hydra/config
+++ b/lib/hydra/config
@@ -78,6 +78,7 @@ function hydra_bootstrap_config {
 
   (
     cd $config
+    make deps
     make submodules
     make config
   )

diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
index 3821dd704590be4541e2394b9b2c927592e4f290..0d60b50b55c68b28d5978a4eb4991b59e4ea085e 100755 (executable)
--- 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