From 125fdaaca9163793a023c299a255a2f5e929d061 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Wed, 16 Mar 2011 21:23:53 -0300
Subject: refac

---
 manifests/admin-stage1.pp | 14 ++++++++++++++
 manifests/admin-stage2.pp | 14 --------------
 manifests/admin_node.pp   |  2 --
 manifests/firewall.pp     |  2 --
 manifests/host-stage1.pp  | 10 ++++++++++
 manifests/host-stage2.pp  |  9 ---------
 manifests/stage0.pp       |  9 +++++++++
 manifests/stage1.pp       |  7 -------
 8 files changed, 33 insertions(+), 34 deletions(-)
 create mode 100644 manifests/admin-stage1.pp
 delete mode 100644 manifests/admin-stage2.pp
 create mode 100644 manifests/host-stage1.pp
 delete mode 100644 manifests/host-stage2.pp
 create mode 100644 manifests/stage0.pp
 delete mode 100644 manifests/stage1.pp

(limited to 'manifests')

diff --git a/manifests/admin-stage1.pp b/manifests/admin-stage1.pp
new file mode 100644
index 0000000..2970516
--- /dev/null
+++ b/manifests/admin-stage1.pp
@@ -0,0 +1,14 @@
+import "config.pp"
+import "nodo"
+
+include default_conf
+include git
+
+# puppet config
+package { [ "puppet", "puppetmaster" ]: ensure => installed, }
+
+service { "puppetmaster":
+  ensure  => stopped,
+  require => Package["puppetmaster"]
+}
+
diff --git a/manifests/admin-stage2.pp b/manifests/admin-stage2.pp
deleted file mode 100644
index 4d81bfb..0000000
--- a/manifests/admin-stage2.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-import "config.pp"
-import "git"
-
-include default_conf
-include git
-
-# puppet config
-package { [ "puppet", "puppetmaster" ]: ensure => installed, }
-
-service { "puppetmaster":
-  ensure  => stopped,
-  require => Package["puppetmaster"]
-}
-
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-stage1.pp b/manifests/host-stage1.pp
new file mode 100644
index 0000000..2360b20
--- /dev/null
+++ b/manifests/host-stage1.pp
@@ -0,0 +1,10 @@
+import "config.pp"
+import "nodo"
+import "admin_node.pp"
+import "firewall.pp"
+
+# creates vserver for administrative node
+include admin_node
+
+# creates firewall rules for administrative node's external acess
+include firewall
diff --git a/manifests/host-stage2.pp b/manifests/host-stage2.pp
deleted file mode 100644
index 0750542..0000000
--- a/manifests/host-stage2.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-import "config.pp"
-import "admin_node.pp"
-import "firewall.pp"
-
-# creates vserver for administrative node
-include admin_node
-
-# creates firewall rules for administrative node's external acess
-include firewal
diff --git a/manifests/stage0.pp b/manifests/stage0.pp
new file mode 100644
index 0000000..675340a
--- /dev/null
+++ b/manifests/stage0.pp
@@ -0,0 +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/manifests/stage1.pp b/manifests/stage1.pp
deleted file mode 100644
index 6a8e82a..0000000
--- a/manifests/stage1.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-import "config.pp"
-import "puppet_bootstrap.pp"
-
-include puppet_bootstrap
-puppet_bootstrap::puppet_modules{ "modules":
-  puppet_dir => "$puppet_bootstrap_tmpdir",
-}
-- 
cgit v1.2.3