refac

diff --git a/manifests/admin-stage2.pp b/manifests/admin-stage1.pp
similarity index 94%
rename from manifests/admin-stage2.pp
rename to manifests/admin-stage1.pp
index 4d81bfb06a260e7ef1fca285ce9963a7664da479..2970516149e8b98e700279b622422ea459302d00 100644 (file)
--- a/manifests/admin-stage2.pp
+++ b/manifests/admin-stage1.pp
@@ -1,5 +1,5 @@
 import "config.pp"
-import "git"
+import "nodo"
 
 include default_conf
 include git

diff --git a/manifests/admin_node.pp b/manifests/admin_node.pp
index cdea2b9b32ca34fa67d1c60dfd08f0edc8357491..bc314e9443b32585f43e6e0e621d93e2abcd0e67 100644 (file)
--- a/manifests/admin_node.pp
+++ b/manifests/admin_node.pp
@@ -1,5 +1,3 @@
-import "nodo"
-
 class admin_node {
   nodo::vserver::instance { "$host-master":
     context      => '2',

diff --git a/manifests/firewall.pp b/manifests/firewall.pp
index 124bb07329df1ddc511dbe0a7b1c5a5d3ac0a841..750fdc6c87a8fd5737c7bbd7b8e4cde9b3ca5246 100644 (file)
--- a/manifests/firewall.pp
+++ b/manifests/firewall.pp
@@ -1,5 +1,3 @@
-import "shorewall"
-
 class firewall {
   include shorewall
 

diff --git a/manifests/host-stage2.pp b/manifests/host-stage1.pp
similarity index 86%
rename from manifests/host-stage2.pp
rename to manifests/host-stage1.pp
index 075054277b82fbc1bf8c75b638ff4836a505fe50..2360b20ec548a0172baa1dab538f567e260a6fe9 100644 (file)
--- a/manifests/host-stage2.pp
+++ b/manifests/host-stage1.pp
@@ -1,4 +1,5 @@
 import "config.pp"
+import "nodo"
 import "admin_node.pp"
 import "firewall.pp"
 
@@ -6,4 +7,4 @@ import "firewall.pp"
 include admin_node
 
 # creates firewall rules for administrative node's external acess
-include firewal
+include firewall

diff --git a/manifests/stage1.pp b/manifests/stage0.pp
similarity index 79%
rename from manifests/stage1.pp
rename to manifests/stage0.pp
index 6a8e82a1ed7c2a3a9b60626d9179f714df4c9665..675340ad7808dbd30a38b249789c804e38371748 100644 (file)
--- a/manifests/stage1.pp
+++ b/manifests/stage0.pp
@@ -1,7 +1,9 @@
 import "config.pp"
 import "puppet_bootstrap.pp"
 
+# setup modules for use with other stages
 include puppet_bootstrap
+
 puppet_bootstrap::puppet_modules{ "modules":
   puppet_dir => "$puppet_bootstrap_tmpdir",
 }

diff --git a/templates/bin/puppet-bootstrap b/templates/bin/puppet-bootstrap
index 3ab9c143ed01c1355a88b61c3ebef933db18c99f..70b5da8b640568314504f93a414eac6f5e7a1156 100644 (file)
--- a/templates/bin/puppet-bootstrap
+++ b/templates/bin/puppet-bootstrap
@@ -18,6 +18,8 @@ function add_submodules {
       git submodule add git://git.sarava.org/puppet-$module.git modules/$module
     fi
   done
+
+  git submodule update --init
 }
 
 if [ $# -ne 2 ]; then