Refactor mongos handling

* Use the system init script for mongos provided in EPEL * Use the correct mongos config file
voxpupuli · Oct 20, 2018 · 5e96da9 · 5e96da9
1 parent 4e31042
commit 5e96da9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 129 deletions.
diff --git a/manifests/mongos/config.pp b/manifests/mongos/config.pp
@@ -6,19 +6,17 @@
   $config_template = $mongodb::mongos::config_template,
   $configdb        = $mongodb::mongos::configdb,
   $config_data     = $mongodb::mongos::config_data,
+  $service_manage  = $mongodb::mongos::service_manage,
 ) {
 
   if ($ensure == 'present' or $ensure == true) {
 
     #Pick which config content to use
     if $config_content {
       $config_content_real = $config_content
-    } elsif $config_template {
-      # Template has $config_data hash available
-      $config_content_real = template($config_template)
     } else {
       # Template has $config_data hash available
-      $config_content_real = template('mongodb/mongodb-shard.conf.erb')
+      $config_content_real = template(pick($config_template, 'mongodb/mongodb-shard.conf.erb'))
     }
 
     file { $config:
@@ -28,6 +26,25 @@
       mode    => '0644',
     }
 
+    if $service_manage {
+      if $facts['os']['family'] == 'RedHat' {
+        file { '/etc/sysconfig/mongos' :
+          ensure  => file,
+          owner   => 'root',
+          group   => 'root',
+          mode    => '0644',
+          content => "OPTIONS=\"--quiet -f ${config}\"\n",
+        }
+      } elsif $facts['os']['family'] == 'Debian' {
+        file { '/etc/init.d/mongos' :
+          ensure  => file,
+          content => template('mongodb/mongos/Debian/mongos.erb'),
+          owner   => 'root',
+          group   => 'root',
+          mode    => '0755',
+        }
+      }
+    }
   }
 
 }
diff --git a/manifests/mongos/service.pp b/manifests/mongos/service.pp
@@ -24,24 +24,6 @@
   }
 
   if $service_manage {
-    if $::osfamily == 'RedHat' {
-      file { '/etc/sysconfig/mongos' :
-        ensure  => file,
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0755',
-        content => 'OPTIONS="--quiet -f /etc/mongodb-shard.conf"',
-        before  => Service['mongos'],
-      }
-    }
-    file { '/etc/init.d/mongos' :
-      ensure  => file,
-      content => template("mongodb/mongos/${::osfamily}/mongos.erb"),
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0755',
-      before  => Service['mongos'],
-    }
     service { 'mongos':
       ensure    => $service_ensure_real,
       name      => $service_name,

diff --git a/spec/classes/mongos_spec.rb b/spec/classes/mongos_spec.rb
@@ -37,7 +37,7 @@
           it { is_expected.not_to contain_file('/etc/sysconfig/mongos') }
         end
 
-        if %w[RedHat Debian].include?(facts[:osfamily])
+        if facts[:osfamily] == 'Debian'
           it { is_expected.to contain_file('/etc/init.d/mongos') }
         else
           it { is_expected.not_to contain_file('/etc/init.d/mongos') }

diff --git a/templates/mongos/RedHat/mongos.erb b/templates/mongos/RedHat/mongos.erb