From ba5ae08f970f3b963f5b68b8407ef63be529bc0c Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Tue, 26 Oct 2010 16:20:33 +0000
Subject: - import current config from valstar

---
 manifests/nodes.pp | 31 +++++++++++++++++++++++++++++--
 manifests/site.pp  |  4 ++--
 2 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'manifests')

diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index f5b1950a..44ea1991 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -1,8 +1,35 @@
-node basenode {
+# svn, big important server
+node valstar {
+	include default_mageia_server
+}
 
+# web apps
+node alamut {
+	include default_mageia_server
 }
 
-node "mx2" inherits {
+# buildnode
+node jonund {
+	include default_mageia_server
+}
 
+node ecosse {
+	include default_mageia_server
 }
 
+
+# backup server
+node fiona {
+	include default_mageia_server
+} 
+
+# gandi-vm
+node krampouezh {
+	include default_mageia_server
+}
+
+node champagne {
+	include default_mageia_server
+}
+
+
diff --git a/manifests/site.pp b/manifests/site.pp
index 0a18bc51..c2906bb4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,2 +1,2 @@
-import "nodes.pp"
-
+import "common"
+import "nodes"
-- 
cgit v1.2.1