From ca34d880f65f62bf78623c80f6e76d1726f2068c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 17 Apr 2014 11:56:36 -0400
Subject: change class instantiating to be includes and organizing things in
 the class to be more visually logical (#5269, #4590, #3712)

Change-Id: I58c28c3bc62e67b25f33da3378e8146110471613
---
 puppet/modules/site_couchdb/manifests/init.pp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index d8e03e41..3614661d 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -68,12 +68,6 @@ class site_couchdb {
     -> Class['site_couchdb::create_dbs']
     -> Class['site_couchdb::add_users']
 
-  class { 'site_couchdb::stunnel': }
-
-  class { 'site_couchdb::bigcouch::add_nodes': }
-
-  class { 'site_couchdb::bigcouch::settle_cluster': }
-
   # /etc/couchdb/couchdb.netrc is deployed by couchdb::query::setup
   # we symlink this to /root/.netrc for couchdb_scripts (eg. backup)
   # and makes life easier for the admin (i.e. using curl/wget without
@@ -92,15 +86,6 @@ class site_couchdb {
     pw    => $couchdb_admin_pw,
   }
 
-  include site_couchdb::create_dbs
-  include site_couchdb::add_users
-  include site_couchdb::designs
-  include site_couchdb::logrotate
-  include site_couchdb::bigcouch::compaction
-
-  include site_shorewall::couchdb
-  include site_shorewall::couchdb::bigcouch
-
   vcsrepo { '/srv/leap/couchdb/scripts':
     ensure   => present,
     provider => git,
@@ -109,8 +94,20 @@ class site_couchdb {
     require  => File['/srv/leap/couchdb']
   }
 
+  include site_couchdb::stunnel
+  include site_couchdb::bigcouch::add_nodes
+  include site_couchdb::bigcouch::settle_cluster
+  include site_couchdb::create_dbs
+  include site_couchdb::add_users
+  include site_couchdb::designs
+  include site_couchdb::logrotate
+  include site_couchdb::bigcouch::compaction
+
   if $couchdb_backup { include site_couchdb::backup }
 
+  include site_shorewall::couchdb
+  include site_shorewall::couchdb::bigcouch
+
   include site_check_mk::agent::couchdb
   include site_check_mk::agent::tapicero
 
-- 
cgit v1.2.3