Skip to content

Commit

Permalink
Add data types to most params
Browse files Browse the repository at this point in the history
  • Loading branch information
William Yardley committed Oct 21, 2017
1 parent c60e4ca commit 9d8fcc5
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 301 deletions.
4 changes: 2 additions & 2 deletions manifests/client.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# is repository dependent.
#
class mongodb::client (
$ensure = $mongodb::params::package_ensure_client,
$package_name = $mongodb::params::client_package_name,
Variant[Boolean, String] $ensure = $mongodb::params::package_ensure_client,
Optional[String] $package_name = $mongodb::params::client_package_name,
) inherits mongodb::params {
anchor { '::mongodb::client::start': }
-> class { '::mongodb::client::install': }
Expand Down
109 changes: 41 additions & 68 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#
# === Parameters
#
# enable_10gen (default: false) - Whether or not to set up 10gen software repositories
# init (auto discovered) - override init (sysv or upstart) for Debian derivatives
# location - override apt location configuration for Debian derivatives
# packagename (auto discovered) - override the package name
Expand All @@ -33,75 +32,53 @@
# Copyright 2013 PuppetLabs
#
class mongodb (
# Deprecated parameters
$enable_10gen = undef,

$init = $mongodb::params::service_provider,
$packagename = undef,
$version = undef,
$servicename = $mongodb::params::service_name,
$service_enable = true, #deprecated
$logpath = $mongodb::params::logpath,
$logappend = true,
$system_logrotate = undef,
$fork = $mongodb::params::fork,
$port = undef,
$dbpath = $mongodb::params::dbpath,
$journal = undef,
$nojournal = undef,
$smallfiles = undef,
$cpu = undef,
$noauth = undef,
$auth = undef,
$verbose = undef,
$objcheck = undef,
$quota = undef,
$oplog = undef, #deprecated it's on if replica set
$oplog_size = undef,
$nohints = undef,
$nohttpinterface = undef,
$noscripting = undef,
$notablescan = undef,
$noprealloc = undef,
$nssize = undef,
$mms_token = undef,
$mms_name = undef,
$mms_interval = undef,
$slave = undef,
$only = undef,
$master = undef,
$source = undef,
$configsvr = undef,
$shardsvr = undef,
$replset = undef,
$rest = undef,
$quiet = undef,
$slowms = undef,
$keyfile = undef,
$key = undef,
$ipv6 = undef,
$bind_ip = undef,
$pidfilepath = undef,
$pidfilemode = undef
Optional[String] $init = $mongodb::params::service_provider,
Optional[String] $packagename = undef,
String $servicename = $mongodb::params::service_name,
Variant[Boolean, Stdlib::Absolutepath] $logpath = $mongodb::params::logpath,
Boolean $logappend = true,
Optional[String] $system_logrotate = undef,
Optional[Boolean] $fork = $mongodb::params::fork,
Optional[Integer[1, 65535]] $port = undef,
Stdlib::Absolutepath $dbpath = $mongodb::params::dbpath,
Optional[Boolean] $journal = undef,
Optional[String] $nojournal = undef,
$smallfiles = undef,
$cpu = undef,
$noauth = undef,
$auth = undef,
$verbose = undef,
$objcheck = undef,
$quota = undef,
$oplog_size = undef,
$nohints = undef,
$nohttpinterface = undef,
$noscripting = undef,
$notablescan = undef,
$noprealloc = undef,
$nssize = undef,
$mms_token = undef,
$mms_name = undef,
$mms_interval = undef,
$configsvr = undef,
$shardsvr = undef,
$replset = undef,
$rest = undef,
$quiet = undef,
$slowms = undef,
Optional[Stdlib::Absolutepath] $keyfile = undef,
Optional[String[6]] $key = undef,
$ipv6 = undef,
Optional[Array[Stdlib::Compat::Ip_address]] $bind_ip = undef,
Optional[Stdlib::Absolutepath] $pidfilepath = undef,
Optional[String] $pidfilemode = undef,
) inherits mongodb::params {

if $enable_10gen {
fail("Parameter enable_10gen is no longer supported. Please use class { 'mongodb::globals': manage_package_repo => true }")
}
if $version {
fail("Parameter version is no longer supported. Please use class { 'mongodb::globals': version => VERSION }")
}
if $oplog {
fail('Parameter is no longer supported. On replica set Oplog is enabled by default.')
}
notify { 'An attempt has been made below to automatically apply your custom
settings to mongodb::server. Please verify this works in a safe test
environment.': }

class { '::mongodb::server':
class { 'mongodb::server':
package_name => $packagename,
logpath => $logpath,
logappend => $logappend,
Expand All @@ -126,10 +103,6 @@
mms_token => $mms_token,
mms_name => $mms_name,
mms_interval => $mms_interval,
slave => $slave,
only => $only,
master => $master,
source => $source,
configsvr => $configsvr,
shardsvr => $shardsvr,
replset => $replset,
Expand Down
42 changes: 21 additions & 21 deletions manifests/mongos.pp
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# This installs a Mongo Shard daemon. See README.md for more details.
class mongodb::mongos (
$ensure = $mongodb::params::mongos_ensure,
$config = $mongodb::params::mongos_config,
$config_content = undef,
$config_template = undef,
$configdb = $mongodb::params::mongos_configdb,
$config_data = $mongodb::params::config_data,
$service_manage = $mongodb::params::mongos_service_manage,
$service_provider = undef,
$service_name = $mongodb::params::mongos_service_name,
$service_enable = $mongodb::params::mongos_service_enable,
$service_ensure = $mongodb::params::mongos_service_ensure,
$service_status = $mongodb::params::mongos_service_status,
$package_ensure = $mongodb::params::package_ensure_mongos,
$package_name = $mongodb::params::mongos_package_name,
$unixsocketprefix = $mongodb::params::mongos_unixsocketprefix,
$pidfilepath = $mongodb::params::mongos_pidfilepath,
$logpath = $mongodb::params::mongos_logpath,
$fork = $mongodb::params::mongos_fork,
$bind_ip = undef,
$port = undef,
$restart = $mongodb::params::mongos_restart,
Variant[Boolean, String] $ensure = $mongodb::params::mongos_ensure,
Stdlib::Absolutepath $config = $mongodb::params::mongos_config,
$config_content = undef,
$config_template = undef,
$configdb = $mongodb::params::mongos_configdb,
Optional[Hash] $config_data = $mongodb::params::config_data,
Boolean $service_manage = $mongodb::params::mongos_service_manage,
Optional[String] $service_provider = undef,
Optional[String] $service_name = $mongodb::params::mongos_service_name,
Boolean $service_enable = $mongodb::params::mongos_service_enable,
Enum['stopped','running'] $service_ensure = $mongodb::params::mongos_service_ensure,
Optional[Enum['stopped','running']] $service_status = $mongodb::params::mongos_service_status,
Variant[Boolean, String] $package_ensure = $mongodb::params::package_ensure_mongos,
String $package_name = $mongodb::params::mongos_package_name,
Optional[Stdlib::Absolutepath] $unixsocketprefix = $mongodb::params::mongos_unixsocketprefix,
Optional[Stdlib::Absolutepath] $pidfilepath = $mongodb::params::mongos_pidfilepath,
Optional[Variant[Boolean, Stdlib::Absolutepath]] $logpath = $mongodb::params::mongos_logpath,
Optional[Boolean] $fork = $mongodb::params::mongos_fork,
Optional[Array[Stdlib::Compat::Ip_address]] $bind_ip = undef,
Optional[Integer[1, 65535]] $port = undef,
Boolean $restart = $mongodb::params::mongos_restart,
) inherits mongodb::params {

if ($ensure == 'present' or $ensure == true) {
Expand Down
3 changes: 3 additions & 0 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
$restart = true
$create_admin = false
$admin_username = 'admin'
$admin_roles = ['userAdmin', 'readWrite', 'dbAdmin', 'dbAdminAnyDatabase', 'readAnyDatabase',
'readWriteAnyDatabase', 'userAdminAnyDatabase', 'clusterAdmin', 'clusterManager', 'clusterMonitor',
'hostManager', 'root', 'restore']
$handle_creds = true
$store_creds = false
$rcfile = "${::root_home}/.mongorc.js"
Expand Down
Loading

0 comments on commit 9d8fcc5

Please sign in to comment.