From bb41b604f7c105b3aa94319827e4b82e330a3dc8 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Tue, 28 Jul 2020 15:24:24 +0300 Subject: [PATCH 1/2] support for yaml in mongodb.cfg --- lib/puppet/provider/mongodb.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/puppet/provider/mongodb.rb b/lib/puppet/provider/mongodb.rb index 56919be77..08f0678ad 100644 --- a/lib/puppet/provider/mongodb.rb +++ b/lib/puppet/provider/mongodb.rb @@ -28,16 +28,16 @@ def self.mongod_conf_file def self.mongo_conf config = YAML.load_file(mongod_conf_file) || {} { - 'bindip' => config['net.bindIp'], - 'port' => config['net.port'], - 'ipv6' => config['net.ipv6'], - 'allowInvalidHostnames' => config['net.ssl.allowInvalidHostnames'], - 'ssl' => config['net.ssl.mode'], - 'sslcert' => config['net.ssl.PEMKeyFile'], - 'sslca' => config['net.ssl.CAFile'], - 'auth' => config['security.authorization'], - 'shardsvr' => config['sharding.clusterRole'], - 'confsvr' => config['sharding.clusterRole'] + 'bindip' => config['net.bindIp'] || config.fetch('net', {}).fetch('bindIp', nil), + 'port' => config['net.port'] || config.fetch('net', {}).fetch('port', nil), + 'ipv6' => config['net.ipv6'] || config.fetch('net', {}).fetch('ipv6', nil), + 'allowInvalidHostnames' => config['net.ssl.allowInvalidHostnames'] || config.fetch('net', {}).fetch('ssl', {}).fetch('allowInvalidHostnames', nil), + 'ssl' => config['net.ssl.mode'] || config.fetch('net', {}).fetch('ssl', {}).fetch('mode', nil), + 'sslcert' => config['net.ssl.PEMKeyFile'] || config.fetch('net', {}).fetch('ssl', {}).fetch('PEMKeyFile', nil), + 'sslca' => config['net.ssl.CAFile'] || config.fetch('net', {}).fetch('ssl', {}).fetch('CAFile', nil), + 'auth' => config['security.authorization'] || config.fetch('security', {}).fetch('authorization', nil), + 'shardsvr' => config['sharding.clusterRole'] || config.fetch('sharding',{}).fetch('clusterRole', nil), + 'confsvr' => config['sharding.clusterRole'] || config.fetch('sharding', {}).fetch('clusterRole', nil) } end From 030cce761f8aa4180cd7f8a641a9a61ab1b77369 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Tue, 28 Jul 2020 15:32:50 +0300 Subject: [PATCH 2/2] fix linting issues --- lib/puppet/provider/mongodb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/mongodb.rb b/lib/puppet/provider/mongodb.rb index 08f0678ad..29bee60e8 100644 --- a/lib/puppet/provider/mongodb.rb +++ b/lib/puppet/provider/mongodb.rb @@ -36,7 +36,7 @@ def self.mongo_conf 'sslcert' => config['net.ssl.PEMKeyFile'] || config.fetch('net', {}).fetch('ssl', {}).fetch('PEMKeyFile', nil), 'sslca' => config['net.ssl.CAFile'] || config.fetch('net', {}).fetch('ssl', {}).fetch('CAFile', nil), 'auth' => config['security.authorization'] || config.fetch('security', {}).fetch('authorization', nil), - 'shardsvr' => config['sharding.clusterRole'] || config.fetch('sharding',{}).fetch('clusterRole', nil), + 'shardsvr' => config['sharding.clusterRole'] || config.fetch('sharding', {}).fetch('clusterRole', nil), 'confsvr' => config['sharding.clusterRole'] || config.fetch('sharding', {}).fetch('clusterRole', nil) } end