Merge branch 'feature/couchdb' into develop

Conflicts:
	puppet/modules/site_shorewall/manifests/eip.pp

1 files changed, 3 insertions, 5 deletions

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index ef5c3a8a..6abf9b48 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -4,7 +4,7 @@ node 'default' {
   include concat::setup
 
   # include some basic classes
-  #include site_config
+  include site_config
 
   # parse services for host
   $services=hiera_array('services')
@@ -15,9 +15,7 @@ node 'default' {
     include site_config::eip
   }
 
-  if 'couchdb' in $services { 
-    class { 'couchdb': 
-      #bind => '0.0.0.0' 
-    }
+  if 'couchdb' in $services {
+    include site_couchdb
   }
 }