diff --git a/manifests/mongos/params.pp b/manifests/mongos/params.pp index 7be61d997..20dc6cc4e 100644 --- a/manifests/mongos/params.pp +++ b/manifests/mongos/params.pp @@ -45,7 +45,7 @@ $pidfilepath = '/var/run/mongodb/mongos.pid' $unixsocketprefix = '/var/run/mongodb' $logpath = '/var/log/mongodb/mongos.log' - $fork = true + $fork = undef # https://github.com/voxpupuli/puppet-mongodb/issues/667 $service_template = 'mongodb/mongos/RedHat/mongos.service-dropin.epp' } } diff --git a/manifests/params.pp b/manifests/params.pp index 999752dd3..47841593f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -51,7 +51,7 @@ $logpath = '/var/log/mongodb/mongod.log' $pidfilepath = '/var/run/mongodb/mongod.pid' $config = '/etc/mongod.conf' - $fork = true + $fork = undef # https://github.com/voxpupuli/puppet-mongodb/issues/667 $journal = true } 'Debian': { diff --git a/spec/classes/mongos_spec.rb b/spec/classes/mongos_spec.rb index 21c18effb..ce21bcb80 100644 --- a/spec/classes/mongos_spec.rb +++ b/spec/classes/mongos_spec.rb @@ -34,7 +34,6 @@ when 'RedHat', 'Suse' 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 diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb index 0610f5175..27fd5c2f5 100644 --- a/spec/classes/server_spec.rb +++ b/spec/classes/server_spec.rb @@ -79,11 +79,7 @@ with_content(%r{^systemLog\.path: #{log_path}$}) end - if facts[:os]['family'] == 'Debian' - it { is_expected.not_to contain_file(config_file).with_content(%r{fork}) } - else - it { is_expected.to contain_file(config_file).with_content(%r{^ fork: true$}) } - end + it { is_expected.not_to contain_file(config_file).with_content(%r{fork}) } it { is_expected.to contain_file('/root/.mongoshrc.js').with_ensure('file').without_content(%r{db\.auth}) } it { is_expected.to contain_file('/var/lib/mongo').with(ensure: 'directory', mode: '0750', owner: mongo_user, group: mongo_group) }