From 804a27c17fbfa962c4080412aa1579962dff927c Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 25 Jul 2020 19:03:51 +0200 Subject: [PATCH] puppet-lint: autofix --- examples/replicaset.pp | 4 ++-- examples/sharding.pp | 35 +++++++++++++++-------------------- manifests/db.pp | 1 - manifests/globals.pp | 1 - manifests/mongos.pp | 1 - manifests/mongos/install.pp | 2 -- manifests/mongos/service.pp | 2 -- manifests/opsmanager.pp | 1 - manifests/replset.pp | 3 +-- manifests/server.pp | 3 --- manifests/server/config.pp | 6 ++---- manifests/server/service.pp | 1 - manifests/shardsvr.pp | 4 +--- spec/classes/server_spec.rb | 2 +- 14 files changed, 22 insertions(+), 44 deletions(-) diff --git a/examples/replicaset.pp b/examples/replicaset.pp index 88257aa60..0175441cb 100644 --- a/examples/replicaset.pp +++ b/examples/replicaset.pp @@ -7,8 +7,8 @@ bind_ip => ['0.0.0.0'], replset => 'rsmain', } - mongodb_replset{'rsmain': - members => ['mongo1:27017', 'mongo2:27017', 'mongo3:27017' ], + mongodb_replset { 'rsmain': + members => ['mongo1:27017', 'mongo2:27017', 'mongo3:27017'], arbiter => 'mongo3:27017', } } diff --git a/examples/sharding.pp b/examples/sharding.pp index 0d7986d43..4f7d918b6 100644 --- a/examples/sharding.pp +++ b/examples/sharding.pp @@ -1,56 +1,51 @@ node 'mongos' { - - class {'mongodb::globals': + class { 'mongodb::globals': manage_package_repo => true, } - -> class {'mongodb::server': + -> class { 'mongodb::server': configsvr => true, bind_ip => [$facts['networking']['ip']], } - -> class {'mongodb::client': } - -> class {'mongodb::mongos': + -> class { 'mongodb::client': } + -> class { 'mongodb::mongos': configdb => ["${facts['networking']['ip']}:27019"], } -> mongodb_shard { 'rs1' : member => 'rs1/mongod1:27018', keys => [{ - 'rs1.foo' => { - 'name' => 1, - } + 'rs1.foo' => { + 'name' => 1, + } }], } - } node 'mongod1' { - - class {'mongodb::globals': + class { 'mongodb::globals': manage_package_repo => true, } - -> class {'mongodb::server': + -> class { 'mongodb::server': shardsvr => true, replset => 'rs1', bind_ip => [$facts['networking']['ip']], } - -> class {'mongodb::client': } - mongodb_replset{'rs1': + -> class { 'mongodb::client': } + mongodb_replset { 'rs1': members => ['mongod1:27018', 'mongod2:27018'], } } node 'mongod2' { - - class {'mongodb::globals': + class { 'mongodb::globals': manage_package_repo => true, } - -> class {'mongodb::server': + -> class { 'mongodb::server': shardsvr => true, replset => 'rs1', bind_ip => [$facts['networking']['ip']], } - -> class {'mongodb::client': } - mongodb_replset{'rs1': + -> class { 'mongodb::client': } + mongodb_replset { 'rs1': members => ['mongod1:27018', 'mongod2:27018'], } - } diff --git a/manifests/db.pp b/manifests/db.pp index e2074292c..7efc4f011 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -19,7 +19,6 @@ Array[String] $roles = ['dbAdmin'], Integer[0] $tries = 10, ) { - unless $facts['mongodb_is_master'] == 'false' { # lint:ignore:quoted_booleans mongodb_database { $db_name: ensure => present, diff --git a/manifests/globals.pp b/manifests/globals.pp index 0121c4c96..8d6ded9fa 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -31,7 +31,6 @@ $pidfilemode = undef, $manage_pidfile = undef, ) { - if $use_enterprise_repo { $edition = 'enterprise' } else { diff --git a/manifests/mongos.pp b/manifests/mongos.pp index edc6a6a8e..4b10fc27b 100644 --- a/manifests/mongos.pp +++ b/manifests/mongos.pp @@ -38,5 +38,4 @@ } else { Class['mongodb::mongos::service'] -> Class['mongodb::mongos::config'] -> Class['mongodb::mongos::install'] } - } diff --git a/manifests/mongos/install.pp b/manifests/mongos/install.pp index 82d8204d6..f45a8a82f 100644 --- a/manifests/mongos/install.pp +++ b/manifests/mongos/install.pp @@ -3,7 +3,6 @@ $package_ensure = $mongodb::mongos::package_ensure, $package_name = $mongodb::mongos::package_name, ) { - unless defined(Package[$package_name]) { package { 'mongodb_mongos': ensure => $package_ensure, @@ -11,5 +10,4 @@ tag => 'mongodb_package', } } - } diff --git a/manifests/mongos/service.pp b/manifests/mongos/service.pp index 2e8e2b327..36ecaca17 100644 --- a/manifests/mongos/service.pp +++ b/manifests/mongos/service.pp @@ -10,7 +10,6 @@ $bind_ip = $mongodb::mongos::bind_ip, $port = $mongodb::mongos::port, ) { - if $package_ensure in ['absent', 'purged'] { $real_service_ensure = 'stopped' $real_service_enable = false @@ -43,5 +42,4 @@ } } } - } diff --git a/manifests/opsmanager.pp b/manifests/opsmanager.pp index 8d65b7166..7844b5409 100644 --- a/manifests/opsmanager.pp +++ b/manifests/opsmanager.pp @@ -55,7 +55,6 @@ Optional[Integer] $snapshot_monthly_retention = undef, # Default: 1 Optional[Integer] $versions_directory = undef, # Linux default: /opt/mongodb/mms/mongodb-releases/ ) { - case $package_ensure { 'absent': { $my_package_ensure = 'absent' diff --git a/manifests/replset.pp b/manifests/replset.pp index dc02eb619..c08fbb999 100644 --- a/manifests/replset.pp +++ b/manifests/replset.pp @@ -1,8 +1,7 @@ # Wrapper class useful for hiera based deployments -class mongodb::replset( +class mongodb::replset ( $sets = undef ) { - if $sets { create_resources(mongodb_replset, $sets) } diff --git a/manifests/server.pp b/manifests/server.pp index 007f52f76..9872580e6 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -80,7 +80,6 @@ Boolean $store_creds = $mongodb::params::store_creds, Array $admin_roles = $mongodb::params::admin_roles, ) inherits mongodb::params { - contain mongodb::server::install contain mongodb::server::config contain mongodb::server::service @@ -122,7 +121,6 @@ if $replset_config { # Copy it to REAL value $_replset_config = $replset_config - } else { # Build up a config hash $_replset_config = { @@ -144,7 +142,6 @@ if $create_admin { Class['mongodb::replset'] -> Mongodb::Db['admin'] } - } } } diff --git a/manifests/server/config.pp b/manifests/server/config.pp index 486af7557..19de77c4d 100644 --- a/manifests/server/config.pp +++ b/manifests/server/config.pp @@ -73,10 +73,9 @@ group => $group, } - if ($logpath and $syslog) { fail('You cannot use syslog with logpath')} + if ($logpath and $syslog) { fail('You cannot use syslog with logpath') } if ($ensure == 'present' or $ensure == true) { - # Exists for future compatibility and clarity. if $auth { $noauth = false @@ -99,7 +98,6 @@ $storage_engine_internal = $storage_engine } - # Pick which config content to use if $config_content { $cfg_content = $config_content @@ -165,7 +163,7 @@ if $handle_creds { if $auth and $store_creds { file { $rcfile: - ensure => present, + ensure => file, content => template('mongodb/mongorc.js.erb'), owner => 'root', group => 'root', diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 3411b236c..001a66c44 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -55,5 +55,4 @@ } } } - } diff --git a/manifests/shardsvr.pp b/manifests/shardsvr.pp index bdc67b509..19a214b20 100644 --- a/manifests/shardsvr.pp +++ b/manifests/shardsvr.pp @@ -1,10 +1,8 @@ # Wrapper class useful for hiera based deployments -class mongodb::shardsvr( +class mongodb::shardsvr ( $shards = undef ) { - if $shards { create_resources(mongodb_shard, $shards) } - } diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb index ffeab1355..0b9c7efa0 100644 --- a/spec/classes/server_spec.rb +++ b/spec/classes/server_spec.rb @@ -237,7 +237,7 @@ it { is_expected.to contain_file('/root/.mongorc.js'). - with_ensure('present'). + with_ensure('file'). with_owner('root'). with_group('root'). with_mode('0600').