Update mongodb to 030100a176a72a32e265b77790d8d15407a13729

030100a176a72a32e265b77790d8d15407a13729 Merge pull request redhat-openstack#205 from puppetlabs/travisci_update
1e6836103b5bbb5d737ee66677b6ad2ad04a791b Updated travisci file for Puppet 4
c50bdb74bed827d023ba885af2daa1082a96150e Merge pull request redhat-openstack#179 from atrepca/MODULES-1712
ab566b666bf02ff61bedc2fb83ab2715429f5053 Add $restart param to control service restarts

Change-Id: I38c3aa2478e149d0af3a4b65b026b78c0f139cb9

Author: xbezdick

Puppetfile

@@ -103,7 +103,7 @@ mod 'module-data',
   :git => 'https://github.com/ripienaar/puppet-module-data.git'
 
 mod 'mongodb',
-  :commit => '14117ae3391862021555df8139c66fd04c13c0c3',
+  :commit => '030100a176a72a32e265b77790d8d15407a13729',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',

mongodb/.travis.yml

@@ -20,8 +20,5 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
   - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-  allow_failures:
-    - rvm: 2.1.6
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false

mongodb/README.md

@@ -430,11 +430,13 @@ Default: <>
 #####`ssl_ca`
 Default: <>
 
-
 #####`service_manage`
 Whether or not the MongoDB service resource should be part of the catalog.
 Default: true
 
+#####`restart`
+Specifies whether the service should be restarted on config changes. Default: 'true'
+
 ####Class: mongodb::mongos
 class. This class should only be used if you want to implement sharding within
 your mongodb deployment.
@@ -486,6 +488,9 @@ This setting can be used to specify if puppet should install the package or not
 This setting can be used to specify the name of the package that should be installed.
 If not specified, the module will use whatever service name is the default for your OS distro.
 
+#####`restart`
+Specifies whether the service should be restarted on config changes. Default: 'true'
+
 ### Definitions
 
 #### Definition: mongodb:db

mongodb/manifests/mongos.pp

@@ -18,14 +18,25 @@
   $fork             = $mongodb::params::mongos_fork,
   $bind_ip          = undef,
   $port             = undef,
+  $restart          = $mongodb::params::mongos_restart,
 ) inherits mongodb::params {
 
   if ($ensure == 'present' or $ensure == true) {
-    anchor { 'mongodb::mongos::start': }->
-    class { '::mongodb::mongos::install': }->
-    class { '::mongodb::mongos::config': }->
-    class { '::mongodb::mongos::service': }->
-    anchor { 'mongodb::mongos::end': }
+    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': }
+    } 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': }
+    }
   } else {
     anchor { 'mongodb::mongos::start': }->
     class { '::mongodb::mongos::service': }->

mongodb/manifests/mongos/config.pp

@@ -20,7 +20,6 @@
       owner   => 'root',
       group   => 'root',
       mode    => '0644',
-      notify  => Class['mongodb::mongos::service']
     }
 
   }

mongodb/manifests/params.pp

@@ -7,12 +7,14 @@
   $service_enable        = pick($mongodb::globals::service_enable, true)
   $service_ensure        = pick($mongodb::globals::service_ensure, 'running')
   $service_status        = $mongodb::globals::service_status
+  $restart               = true
 
   $mongos_service_manage = pick($mongodb::globals::mongos_service_manage, true)
   $mongos_service_enable = pick($mongodb::globals::mongos_service_enable, true)
   $mongos_service_ensure = pick($mongodb::globals::mongos_service_ensure, 'running')
   $mongos_service_status = $mongodb::globals::mongos_service_status
   $mongos_configdb       = '127.0.0.1:27019'
+  $mongos_restart        = true
 
   # Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
   case $::osfamily {

mongodb/manifests/server.pp

@@ -64,6 +64,7 @@
   $ssl             = undef,
   $ssl_key         = undef,
   $ssl_ca          = undef,
+  $restart         = $mongodb::params::restart,
 
   # Deprecated parameters
   $master          = undef,
@@ -78,11 +79,21 @@
   }
 
   if ($ensure == 'present' or $ensure == true) {
-    anchor { 'mongodb::server::start': }->
-    class { '::mongodb::server::install': }->
-    class { '::mongodb::server::config': }->
-    class { '::mongodb::server::service': }->
-    anchor { 'mongodb::server::end': }
+    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': }
+    } 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': }
+    }
   } else {
     anchor { 'mongodb::server::start': }->
     class { '::mongodb::server::service': }->

mongodb/manifests/server/config.pp

@@ -97,7 +97,6 @@
       owner   => 'root',
       group   => 'root',
       mode    => '0644',
-      notify  => Class['mongodb::server::service']
     }
 
     file { $dbpath: