Fix mongos config handling

Author: ekohl

manifests/mongos/config.pp

@@ -1,12 +1,19 @@
 # PRIVATE CLASS: do not call directly
 class mongodb::mongos::config (
-  $package_ensure  = $mongodb::mongos::package_ensure,
-  $config          = $mongodb::mongos::config,
-  $config_content  = $mongodb::mongos::config_content,
-  $config_template = $mongodb::mongos::config_template,
-  $configdb        = $mongodb::mongos::configdb,
-  $config_data     = $mongodb::mongos::config_data,
-  $service_manage  = $mongodb::mongos::service_manage,
+  $package_ensure   = $mongodb::mongos::package_ensure,
+  $config           = $mongodb::mongos::config,
+  $config_content   = $mongodb::mongos::config_content,
+  $config_template  = $mongodb::mongos::config_template,
+  $service_manage   = $mongodb::mongos::service_manage,
+  # Used in the template
+  $configdb         = $mongodb::mongos::configdb,
+  $bind_ip          = $mongodb::mongos::bind_ip,
+  $port             = $mongodb::mongos::port,
+  $fork             = $mongodb::mongos::fork,
+  $pidfilepath      = $mongodb::mongos::pidfilepath,
+  $logpath          = $mongodb::mongos::logpath,
+  $unixsocketprefix = $mongodb::mongos::unixsocketprefix,
+  $config_data      = $mongodb::mongos::config_data,
 ) {
   if $package_ensure == 'purged' {
     $ensure = 'absent'

spec/classes/mongos_spec.rb

@@ -5,6 +5,14 @@
     context "on #{os}" do
       let(:facts) { facts }
 
+      let(:config_file) do
+        if facts[:osfamily] == 'RedHat'
+          '/etc/mongos.conf'
+        else
+          '/etc/mongodb-shard.conf'
+        end
+      end
+
       context 'with defaults' do
         it { is_expected.to compile.with_all_deps }
 
@@ -17,9 +25,21 @@
 
         case facts[:osfamily]
         when 'RedHat'
-          it { is_expected.to contain_file('/etc/mongos.conf') }
+          expected_content = <<-CONFIG
+configdb = 127.0.0.1:27019
+fork = true
+pidfilepath = /var/run/mongodb/mongos.pid
+logpath = /var/log/mongodb/mongos.log
+unixSocketPrefix = /var/run/mongodb
+          CONFIG
+
+          it { is_expected.to contain_file('/etc/mongos.conf').with_content(expected_content) }
         when 'Debian'
-          it { is_expected.to contain_file('/etc/mongodb-shard.conf') }
+          expected_content = <<-CONFIG
+configdb = 127.0.0.1:27019
+          CONFIG
+
+          it { is_expected.to contain_file('/etc/mongodb-shard.conf').with_content(expected_content) }
         end
 
         # service

templates/mongodb-shard.conf.erb

@@ -19,7 +19,6 @@ logpath = <%= @logpath %>
 <% if @unixsocketprefix -%>
 unixSocketPrefix = <%= @unixsocketprefix %>
 <% end -%>
-
 <% if @config_data -%>
 <% @config_data.each do |k,v| -%>
 <%= k %> = <%= v %>