Merge pull request #420 from ekohl/replace-anchors

Replace anchors with contain

Author: wyardley

manifests/mongos.pp

@@ -22,29 +22,22 @@
   Optional[Integer[1, 65535]] $port                         = undef,
   Boolean $restart                                          = $mongodb::params::mongos_restart,
 ) inherits mongodb::params {
+  contain mongodb::mongos::install
+  contain mongodb::mongos::config
+  contain mongodb::mongos::service
 
   if ($ensure == 'present' or $ensure == true) {
+    Class['mongodb::mongos::install'] -> Class['mongodb::mongos::config']
+
     if $restart {
-      anchor { 'mongodb::mongos::start': }
-      -> class { 'mongodb::mongos::install': }
       # If $restart is true, notify the service on config changes (~>)
-      -> class { 'mongodb::mongos::config': }
-      ~> class { 'mongodb::mongos::service': }
-      -> anchor { 'mongodb::mongos::end': }
+      Class['mongodb::mongos::config'] ~> Class['mongodb::mongos::service']
     } else {
-      anchor { 'mongodb::mongos::start': }
-      -> class { 'mongodb::mongos::install': }
       # If $restart is false, config changes won't restart the service (->)
-      -> class { 'mongodb::mongos::config': }
-      -> class { 'mongodb::mongos::service': }
-      -> anchor { 'mongodb::mongos::end': }
+      Class['mongodb::mongos::config'] -> Class['mongodb::mongos::service']
     }
   } else {
-    anchor { 'mongodb::mongos::start': }
-    -> class { 'mongodb::mongos::service': }
-    -> class { 'mongodb::mongos::config': }
-    -> class { 'mongodb::mongos::install': }
-    -> anchor { 'mongodb::mongos::end': }
+    Class['mongodb::mongos::service'] -> Class['mongodb::mongos::config'] -> Class['mongodb::mongos::install']
   }
 
 }

manifests/server.pp

@@ -80,28 +80,22 @@
   Array $admin_roles                                   = $mongodb::params::admin_roles,
 ) inherits mongodb::params {
 
+  contain mongodb::server::install
+  contain mongodb::server::config
+  contain mongodb::server::service
+
   if ($ensure == 'present' or $ensure == true) {
+    Class['mongodb::server::install'] -> Class['mongodb::server::config']
+
     if $restart {
-      anchor { 'mongodb::server::start': }
-      -> class { 'mongodb::server::install': }
       # If $restart is true, notify the service on config changes (~>)
-      -> class { 'mongodb::server::config': }
-      ~> class { 'mongodb::server::service': }
-      -> anchor { 'mongodb::server::end': }
+      Class['mongodb::server::config'] ~> Class['mongodb::server::service']
     } else {
-      anchor { 'mongodb::server::start': }
-      -> class { 'mongodb::server::install': }
       # If $restart is false, config changes won't restart the service (->)
-      -> class { 'mongodb::server::config': }
-      -> class { 'mongodb::server::service': }
-      -> anchor { 'mongodb::server::end': }
+      Class['mongodb::server::config'] -> Class['mongodb::server::service']
     }
   } else {
-    anchor { 'mongodb::server::start': }
-    -> class { 'mongodb::server::service': }
-    -> class { 'mongodb::server::config': }
-    -> class { 'mongodb::server::install': }
-    -> anchor { 'mongodb::server::end': }
+    Class['mongodb::server::service'] -> Class['mongodb::server::config'] -> Class['mongodb::server::install']
   }
 
   if $create_admin and ($service_ensure == 'running' or $service_ensure == true) {
@@ -111,9 +105,6 @@
       roles    => $admin_roles,
     }
 
-    # Make sure it runs at the correct point
-    Anchor['mongodb::server::end'] -> Mongodb::Db['admin']
-
     # Make sure it runs before other DB creation
     Mongodb::Db['admin'] -> Mongodb::Db <| title != 'admin' |>
   }
@@ -148,8 +139,6 @@
 
       $replset_config_real = $_replset_config  # lint:ignore:variable_is_lowercase required for compatibility
 
-      Anchor['mongodb::server::end'] -> Class['mongodb::replset']
-
       # Make sure that the ordering is correct
       if $create_admin {
         Class['mongodb::replset'] -> Mongodb::Db['admin']

spec/classes/server_spec.rb

@@ -49,8 +49,9 @@
                                                        'roles'    => %w[userAdmin readWrite dbAdmin dbAdminAnyDatabase
                                                                         readAnyDatabase readWriteAnyDatabase userAdminAnyDatabase
                                                                         clusterAdmin clusterManager clusterMonitor hostManager
-                                                                        root restore]).that_requires('Anchor[mongodb::server::end]')
+                                                                        root restore])
     }
+    it { is_expected.to contain_mongodb_database('admin').that_requires('Service[mongodb]') }
   end
 
   context 'when deploying on Solaris' do