[puppet] Actually, make a module of default-setup to avoid import conflict in between nodes.
commit 7cc5f2f04a6bfd343527d87de0fbaa16cd252a9b
Author: Xavier Lamien <laxathom(a)lxtnow.net>
Date: Sat Sep 7 02:38:39 2013 +0200
Actually, make a module of default-setup to avoid import conflict in between nodes.
manifests/default-setup.pp | 73 --------------------------------------------
manifests/nodes.pp | 8 ++++-
2 files changed, 7 insertions(+), 74 deletions(-)
---
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 8d0b752..d438373 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -1,8 +1,8 @@
# Nodes, alphabetically
-import 'default-setup.pp'
node 'builder1.ovh.rpmfusion.lan' {
+ class { 'default::setup': }
$arch = 'i386'
class { 'plague::builder':
build_hostname => 'builder1.rpmfusion.org',
@@ -14,6 +14,7 @@ node 'builder1.ovh.rpmfusion.lan' {
}
node 'bugzilla.ovh.rpmfusion.lan' {
+ class { 'default::setup': }
# Bugzilla
package { 'bugzilla': ensure => installed }
file { '/etc/bugzilla/localconfig':
@@ -64,6 +65,7 @@ node 'scm1.rpmfusion.org' {
}
node 'hv02.ovh.rpmfusion.net' {
+ class { 'default::setup': }
# Manually installed before the puppetmaster
# Web server
class { 'nginx': }
@@ -160,6 +162,7 @@ node 'hv02.ovh.rpmfusion.net' {
}
node 'puppet.ovh.rpmfusion.lan' {
+ class { 'default::setup': }
class { 'puppet::master': }
iptables { '/etc/sysconfig/iptables':
# Open "globally", since private only
@@ -180,6 +183,7 @@ node 'puppet.ovh.rpmfusion.lan' {
}
node 'se01.ovh.rpmfusion.net' {
+ class { 'default::setup': }
# The chroot is a big bind-mount mess with RHEL6...
class { 'bind::server': chroot => false }
# Bind config : Authoritative-only name server for RPM Fusion zones
@@ -319,6 +323,7 @@ node 'se01.ovh.rpmfusion.net' {
}
node 'se02.ovh.rpmfusion.net' {
+ class { 'default::setup': }
# Main web server
# Apache httpd config
apache_httpd { 'worker':
@@ -359,6 +364,7 @@ node 'se02.ovh.rpmfusion.net' {
}
node 'se03.ovh.rpmfusion.net' {
+ class { 'default::setup': }
# Reverse proxying to old02
class { 'nginx': }
nginx::file { 'se03.conf':