Skip to content

Commit 9d8fcc5

Browse files
author
William Yardley
committed
Add data types to most params
1 parent c60e4ca commit 9d8fcc5

6 files changed

Lines changed: 147 additions & 301 deletions

File tree

‎manifests/client.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# is repository dependent.
1010
#
1111
class mongodb::client (
12-
$ensure = $mongodb::params::package_ensure_client,
13-
$package_name = $mongodb::params::client_package_name,
12+
Variant[Boolean, String] $ensure = $mongodb::params::package_ensure_client,
13+
Optional[String] $package_name = $mongodb::params::client_package_name,
1414
) inherits mongodb::params {
1515
anchor { '::mongodb::client::start': }
1616
-> class { '::mongodb::client::install': }

‎manifests/init.pp‎

Lines changed: 41 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#
88
# === Parameters
99
#
10-
# enable_10gen (default: false) - Whether or not to set up 10gen software repositories
1110
# init (auto discovered) - override init (sysv or upstart) for Debian derivatives
1211
# location - override apt location configuration for Debian derivatives
1312
# packagename (auto discovered) - override the package name
@@ -33,75 +32,53 @@
3332
# Copyright 2013 PuppetLabs
3433
#
3534
class mongodb (
36-
# Deprecated parameters
37-
$enable_10gen = undef,
38-
39-
$init = $mongodb::params::service_provider,
40-
$packagename = undef,
41-
$version = undef,
42-
$servicename = $mongodb::params::service_name,
43-
$service_enable = true, #deprecated
44-
$logpath = $mongodb::params::logpath,
45-
$logappend = true,
46-
$system_logrotate = undef,
47-
$fork = $mongodb::params::fork,
48-
$port = undef,
49-
$dbpath = $mongodb::params::dbpath,
50-
$journal = undef,
51-
$nojournal = undef,
52-
$smallfiles = undef,
53-
$cpu = undef,
54-
$noauth = undef,
55-
$auth = undef,
56-
$verbose = undef,
57-
$objcheck = undef,
58-
$quota = undef,
59-
$oplog = undef, #deprecated it's on if replica set
60-
$oplog_size = undef,
61-
$nohints = undef,
62-
$nohttpinterface = undef,
63-
$noscripting = undef,
64-
$notablescan = undef,
65-
$noprealloc = undef,
66-
$nssize = undef,
67-
$mms_token = undef,
68-
$mms_name = undef,
69-
$mms_interval = undef,
70-
$slave = undef,
71-
$only = undef,
72-
$master = undef,
73-
$source = undef,
74-
$configsvr = undef,
75-
$shardsvr = undef,
76-
$replset = undef,
77-
$rest = undef,
78-
$quiet = undef,
79-
$slowms = undef,
80-
$keyfile = undef,
81-
$key = undef,
82-
$ipv6 = undef,
83-
$bind_ip = undef,
84-
$pidfilepath = undef,
85-
$pidfilemode = undef
35+
Optional[String] $init = $mongodb::params::service_provider,
36+
Optional[String] $packagename = undef,
37+
String $servicename = $mongodb::params::service_name,
38+
Variant[Boolean, Stdlib::Absolutepath] $logpath = $mongodb::params::logpath,
39+
Boolean $logappend = true,
40+
Optional[String] $system_logrotate = undef,
41+
Optional[Boolean] $fork = $mongodb::params::fork,
42+
Optional[Integer[1, 65535]] $port = undef,
43+
Stdlib::Absolutepath $dbpath = $mongodb::params::dbpath,
44+
Optional[Boolean] $journal = undef,
45+
Optional[String] $nojournal = undef,
46+
$smallfiles = undef,
47+
$cpu = undef,
48+
$noauth = undef,
49+
$auth = undef,
50+
$verbose = undef,
51+
$objcheck = undef,
52+
$quota = undef,
53+
$oplog_size = undef,
54+
$nohints = undef,
55+
$nohttpinterface = undef,
56+
$noscripting = undef,
57+
$notablescan = undef,
58+
$noprealloc = undef,
59+
$nssize = undef,
60+
$mms_token = undef,
61+
$mms_name = undef,
62+
$mms_interval = undef,
63+
$configsvr = undef,
64+
$shardsvr = undef,
65+
$replset = undef,
66+
$rest = undef,
67+
$quiet = undef,
68+
$slowms = undef,
69+
Optional[Stdlib::Absolutepath] $keyfile = undef,
70+
Optional[String[6]] $key = undef,
71+
$ipv6 = undef,
72+
Optional[Array[Stdlib::Compat::Ip_address]] $bind_ip = undef,
73+
Optional[Stdlib::Absolutepath] $pidfilepath = undef,
74+
Optional[String] $pidfilemode = undef,
8675
) inherits mongodb::params {
8776

88-
if $enable_10gen {
89-
fail("Parameter enable_10gen is no longer supported. Please use class { 'mongodb::globals': manage_package_repo => true }")
90-
}
91-
92-
if $version {
93-
fail("Parameter version is no longer supported. Please use class { 'mongodb::globals': version => VERSION }")
94-
}
95-
96-
if $oplog {
97-
fail('Parameter is no longer supported. On replica set Oplog is enabled by default.')
98-
}
99-
10077
notify { 'An attempt has been made below to automatically apply your custom
10178
settings to mongodb::server. Please verify this works in a safe test
10279
environment.': }
10380

104-
class { '::mongodb::server':
81+
class { 'mongodb::server':
10582
package_name => $packagename,
10683
logpath => $logpath,
10784
logappend => $logappend,
@@ -126,10 +103,6 @@
126103
mms_token => $mms_token,
127104
mms_name => $mms_name,
128105
mms_interval => $mms_interval,
129-
slave => $slave,
130-
only => $only,
131-
master => $master,
132-
source => $source,
133106
configsvr => $configsvr,
134107
shardsvr => $shardsvr,
135108
replset => $replset,

‎manifests/mongos.pp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# This installs a Mongo Shard daemon. See README.md for more details.
22
class mongodb::mongos (
3-
$ensure = $mongodb::params::mongos_ensure,
4-
$config = $mongodb::params::mongos_config,
5-
$config_content = undef,
6-
$config_template = undef,
7-
$configdb = $mongodb::params::mongos_configdb,
8-
$config_data = $mongodb::params::config_data,
9-
$service_manage = $mongodb::params::mongos_service_manage,
10-
$service_provider = undef,
11-
$service_name = $mongodb::params::mongos_service_name,
12-
$service_enable = $mongodb::params::mongos_service_enable,
13-
$service_ensure = $mongodb::params::mongos_service_ensure,
14-
$service_status = $mongodb::params::mongos_service_status,
15-
$package_ensure = $mongodb::params::package_ensure_mongos,
16-
$package_name = $mongodb::params::mongos_package_name,
17-
$unixsocketprefix = $mongodb::params::mongos_unixsocketprefix,
18-
$pidfilepath = $mongodb::params::mongos_pidfilepath,
19-
$logpath = $mongodb::params::mongos_logpath,
20-
$fork = $mongodb::params::mongos_fork,
21-
$bind_ip = undef,
22-
$port = undef,
23-
$restart = $mongodb::params::mongos_restart,
3+
Variant[Boolean, String] $ensure = $mongodb::params::mongos_ensure,
4+
Stdlib::Absolutepath $config = $mongodb::params::mongos_config,
5+
$config_content = undef,
6+
$config_template = undef,
7+
$configdb = $mongodb::params::mongos_configdb,
8+
Optional[Hash] $config_data = $mongodb::params::config_data,
9+
Boolean $service_manage = $mongodb::params::mongos_service_manage,
10+
Optional[String] $service_provider = undef,
11+
Optional[String] $service_name = $mongodb::params::mongos_service_name,
12+
Boolean $service_enable = $mongodb::params::mongos_service_enable,
13+
Enum['stopped','running'] $service_ensure = $mongodb::params::mongos_service_ensure,
14+
Optional[Enum['stopped','running']] $service_status = $mongodb::params::mongos_service_status,
15+
Variant[Boolean, String] $package_ensure = $mongodb::params::package_ensure_mongos,
16+
String $package_name = $mongodb::params::mongos_package_name,
17+
Optional[Stdlib::Absolutepath] $unixsocketprefix = $mongodb::params::mongos_unixsocketprefix,
18+
Optional[Stdlib::Absolutepath] $pidfilepath = $mongodb::params::mongos_pidfilepath,
19+
Optional[Variant[Boolean, Stdlib::Absolutepath]] $logpath = $mongodb::params::mongos_logpath,
20+
Optional[Boolean] $fork = $mongodb::params::mongos_fork,
21+
Optional[Array[Stdlib::Compat::Ip_address]] $bind_ip = undef,
22+
Optional[Integer[1, 65535]] $port = undef,
23+
Boolean $restart = $mongodb::params::mongos_restart,
2424
) inherits mongodb::params {
2525

2626
if ($ensure == 'present' or $ensure == true) {

‎manifests/params.pp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
$restart = true
1111
$create_admin = false
1212
$admin_username = 'admin'
13+
$admin_roles = ['userAdmin', 'readWrite', 'dbAdmin', 'dbAdminAnyDatabase', 'readAnyDatabase',
14+
'readWriteAnyDatabase', 'userAdminAnyDatabase', 'clusterAdmin', 'clusterManager', 'clusterMonitor',
15+
'hostManager', 'root', 'restore']
1316
$handle_creds = true
1417
$store_creds = false
1518
$rcfile = "${::root_home}/.mongorc.js"

0 commit comments

Comments
 (0)