diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/admin-stage1.pp (renamed from manifests/admin-stage2.pp) | 2 | ||||
| -rw-r--r-- | manifests/admin_node.pp | 2 | ||||
| -rw-r--r-- | manifests/firewall.pp | 2 | ||||
| -rw-r--r-- | manifests/host-stage1.pp (renamed from manifests/host-stage2.pp) | 3 | ||||
| -rw-r--r-- | manifests/stage0.pp (renamed from manifests/stage1.pp) | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/manifests/admin-stage2.pp b/manifests/admin-stage1.pp index 4d81bfb..2970516 100644 --- 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 cdea2b9..bc314e9 100644 --- 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 124bb07..750fdc6 100644 --- 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 index 0750542..2360b20 100644 --- 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 index 6a8e82a..675340a 100644 --- 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", } |