puppet tags: site_config::default and site_config::slow

1 files changed, 29 insertions, 37 deletions

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 33566f0c..146b373e 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -5,41 +5,33 @@ stage { 'initial':
   before => Stage['main'],
 }
 
-node 'default' {
-  # prerequisites
-  import 'common'
-  include concat::setup
-
-  $development = hiera('development')
-  if $development['site_config'] == true {
-    # include some basic classes
-    include site_config
-  } else {
-    notice ('NOT applying site_config')
-  }
-
-  # parse services for host
-  $services=hiera_array('services')
-  notice("Services for $fqdn: $services")
-
-  # configure eip
-  if 'openvpn' in $services {
-    include site_openvpn
-  }
-
-  if 'couchdb' in $services {
-    include site_couchdb
-  }
-
-  if 'webapp' in $services {
-    include site_webapp
-  }
-
-  if 'ca' in $services {
-    include site_ca_daemon
-  }
-
-  if 'monitor' in $services {
-    include site_nagios::server
-  }
+# prerequisites
+import 'common'
+include concat::setup
+include site_config::default
+include site_config::slow
+
+# parse services for host
+$services=hiera_array('services')
+notice("Services for ${fqdn}: ${services}")
+
+# configure eip
+if 'openvpn' in $services {
+  include site_openvpn
+}
+
+if 'couchdb' in $services {
+  include site_couchdb
+}
+
+if 'webapp' in $services {
+  include site_webapp
+}
+
+if 'ca' in $services {
+  include site_ca_daemon
+}
+
+if 'monitor' in $services {
+  include site_nagios::server
 }