aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-12-10 19:54:41 +0000
committerNicolas Vigier <boklm@mageia.org>2012-12-10 19:54:41 +0000
commit095c856a9146e539d3b35954b126a1885e0d8550 (patch)
tree42a76310a8490ddef6ffec73f2dfb26374030471
parent5598f40d95022d6b03ea9d2c2bd8df33e7f34c0c (diff)
downloadpuppet-095c856a9146e539d3b35954b126a1885e0d8550.tar
puppet-095c856a9146e539d3b35954b126a1885e0d8550.tar.gz
puppet-095c856a9146e539d3b35954b126a1885e0d8550.tar.bz2
puppet-095c856a9146e539d3b35954b126a1885e0d8550.tar.xz
puppet-095c856a9146e539d3b35954b126a1885e0d8550.zip
Add mga_buildsystem::buildnode
And use it on ecosse and jonund instead of buildsystem::buildnode.
-rw-r--r--deployment/mga_buildsystem/manifests/buildnode.pp3
-rw-r--r--manifests/nodes/ecosse.pp2
-rw-r--r--manifests/nodes/jonund.pp2
3 files changed, 5 insertions, 2 deletions
diff --git a/deployment/mga_buildsystem/manifests/buildnode.pp b/deployment/mga_buildsystem/manifests/buildnode.pp
new file mode 100644
index 00000000..fc6066bf
--- /dev/null
+++ b/deployment/mga_buildsystem/manifests/buildnode.pp
@@ -0,0 +1,3 @@
+class mga_buildsystem::buildnode {
+ include buildsystem::buildnode
+}
diff --git a/manifests/nodes/ecosse.pp b/manifests/nodes/ecosse.pp
index a106d0ed..c7fa95e5 100644
--- a/manifests/nodes/ecosse.pp
+++ b/manifests/nodes/ecosse.pp
@@ -2,6 +2,6 @@ node ecosse {
# Location: IELO datacenter (marseille)
#
include common::default_mageia_server
- include buildsystem::buildnode
+ include mga_buildsystem::buildnode
timezone::timezone { 'Europe/Paris': }
}
diff --git a/manifests/nodes/jonund.pp b/manifests/nodes/jonund.pp
index ff448844..6e8e7f72 100644
--- a/manifests/nodes/jonund.pp
+++ b/manifests/nodes/jonund.pp
@@ -3,7 +3,7 @@ node jonund {
# Location: IELO datacenter (marseille)
#
include common::default_mageia_server
- include buildsystem::buildnode
+ include mga_buildsystem::buildnode
include buildsystem::iurt20101
timezone::timezone { 'Europe/Paris': }
# include shorewall