aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-10-26 16:20:33 +0000
committerMichael Scherer <misc@mageia.org>2010-10-26 16:20:33 +0000
commitba5ae08f970f3b963f5b68b8407ef63be529bc0c (patch)
treecba36e2d243c3b1d11b7ac8265216487f8f9e6e6
parentfd8c235842116344a0eed4e79d04f409680ce91d (diff)
downloadpuppet-ba5ae08f970f3b963f5b68b8407ef63be529bc0c.tar
puppet-ba5ae08f970f3b963f5b68b8407ef63be529bc0c.tar.gz
puppet-ba5ae08f970f3b963f5b68b8407ef63be529bc0c.tar.bz2
puppet-ba5ae08f970f3b963f5b68b8407ef63be529bc0c.tar.xz
puppet-ba5ae08f970f3b963f5b68b8407ef63be529bc0c.zip
- import current config from valstar
-rw-r--r--manifests/nodes.pp31
-rw-r--r--manifests/site.pp4
2 files changed, 31 insertions, 4 deletions
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"