diff --git a/README.md b/README.md index 90b754588..9ef509f2a 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,11 @@ instance, without sharding functionality. ### Beginning with MongoDB If you just want a server installation with the default options you can run -`include '::mongodb::server'`. If you need to customize configuration +`include mongodb::server`. If you need to customize configuration options you need to do the following: ```puppet -class {'::mongodb::server': +class {'mongodb::server': port => 27018, verbose => true, } @@ -56,7 +56,7 @@ class {'::mongodb::server': For Red Hat family systems, the client can be installed in a similar fashion: ```puppet -class {'::mongodb::client':} +class {'mongodb::client':} ``` Note that for Debian/Ubuntu family systems the client is installed with the @@ -66,7 +66,7 @@ If one plans to configure sharding for a Mongo deployment, the module offer the `mongos` installation. `mongos` can be installed the following way : ```puppet -class {'::mongodb::mongos' : +class {'mongodb::mongos' : configdb => ['configsvr1.example.com:27018'], } ``` @@ -77,11 +77,11 @@ packages are outdated and not appropriate for a production environment. To install MongoDB from 10gen repository: ```puppet -class {'::mongodb::globals': +class {'mongodb::globals': manage_package_repo => true, -}-> -class {'::mongodb::client': } -> -class {'::mongodb::server': } +} +-> class {'mongodb::client': } +-> class {'mongodb::server': } ``` If you don't want to use the 10gen/MongoDB software repository or the OS packages, @@ -89,12 +89,12 @@ you can point the module to a custom one. To install MongoDB from a custom repository: ```puppet -class {'::mongodb::globals': +class {'mongodb::globals': manage_package_repo => true, repo_location => 'http://example.com/repo' -}-> -class {'::mongodb::server': }-> -class {'::mongodb::client': } +} +-> class {'mongodb::server': } +-> class {'mongodb::client': } ``` Having a local copy of MongoDB repository (that is managed by your private modules) @@ -102,12 +102,12 @@ you can still enjoy the charms of `mongodb::params` that manage packages. To disable managing of repository, but still enable managing packages: ```puppet -class {'::mongodb::globals': +class {'mongodb::globals': manage_package_repo => false, manage_package => true, -}-> -class {'::mongodb::server': }-> -class {'::mongodb::client': } +} +-> class {'mongodb::server': } +-> class {'mongodb::client': } ``` ## Usage @@ -124,7 +124,7 @@ On its own it does nothing. To install MongoDB server, create database "testdb" and user "user1" with password "pass1". ```puppet -class {'::mongodb::server': +class {'mongodb::server': auth => true, } diff --git a/examples/client.pp b/examples/client.pp index 56a3e6d40..8d8c069da 100644 --- a/examples/client.pp +++ b/examples/client.pp @@ -1,2 +1,2 @@ -class { '::mongodb::globals': manage_package_repo => true } --> class { '::mongodb::client': } +class { 'mongodb::globals': manage_package_repo => true } +-> class { 'mongodb::client': } diff --git a/examples/globals.pp b/examples/globals.pp index 4d5e0db1c..6cb391940 100644 --- a/examples/globals.pp +++ b/examples/globals.pp @@ -1,3 +1,3 @@ -class { '::mongodb::globals': +class { 'mongodb::globals': manage_package_repo => true, } diff --git a/examples/init.pp b/examples/init.pp index aac044ee0..d6a768812 100644 --- a/examples/init.pp +++ b/examples/init.pp @@ -1 +1 @@ -class { '::mongodb': } +class { 'mongodb': } diff --git a/examples/replicaset.pp b/examples/replicaset.pp index a77831199..88257aa60 100644 --- a/examples/replicaset.pp +++ b/examples/replicaset.pp @@ -1,8 +1,8 @@ node default { - class { '::mongodb::globals': + class { 'mongodb::globals': manage_package_repo => true, } - -> class { '::mongodb::server': + -> class { 'mongodb::server': smallfiles => true, bind_ip => ['0.0.0.0'], replset => 'rsmain', diff --git a/examples/server.pp b/examples/server.pp index b3f9850fb..6751e2d40 100644 --- a/examples/server.pp +++ b/examples/server.pp @@ -1,2 +1,2 @@ -class { '::mongodb::globals': manage_package_repo => true } --> class { '::mongodb::server': } +class { 'mongodb::globals': manage_package_repo => true } +-> class { 'mongodb::server': } diff --git a/examples/sharding.pp b/examples/sharding.pp index 9f313325b..ab4975c20 100644 --- a/examples/sharding.pp +++ b/examples/sharding.pp @@ -1,14 +1,14 @@ node 'mongos' { - class {'::mongodb::globals': + class {'mongodb::globals': manage_package_repo => true, } - -> class {'::mongodb::server': + -> class {'mongodb::server': configsvr => true, bind_ip => $::ipaddress, } - -> class {'::mongodb::client': } - -> class {'::mongodb::mongos': + -> class {'mongodb::client': } + -> class {'mongodb::mongos': configdb => ["${::ipaddress}:27019"], } -> mongodb_shard { 'rs1' : @@ -24,15 +24,15 @@ node 'mongod1' { - class {'::mongodb::globals': + class {'mongodb::globals': manage_package_repo => true, } - -> class {'::mongodb::server': + -> class {'mongodb::server': shardsvr => true, replset => 'rs1', bind_ip => $::ipaddress, } - -> class {'::mongodb::client': } + -> class {'mongodb::client': } mongodb_replset{'rs1': members => ['mongod1:27018', 'mongod2:27018'], } @@ -40,15 +40,15 @@ node 'mongod2' { - class {'::mongodb::globals': + class {'mongodb::globals': manage_package_repo => true, } - -> class {'::mongodb::server': + -> class {'mongodb::server': shardsvr => true, replset => 'rs1', bind_ip => $::ipaddress, } - -> class {'::mongodb::client': } + -> class {'mongodb::client': } mongodb_replset{'rs1': members => ['mongod1:27018', 'mongod2:27018'], } diff --git a/lib/puppet/provider/mongodb.rb b/lib/puppet/provider/mongodb.rb index 14f4237bf..752ab82a3 100644 --- a/lib/puppet/provider/mongodb.rb +++ b/lib/puppet/provider/mongodb.rb @@ -27,7 +27,7 @@ def self.mongo_conf file = mongod_conf_file # The mongo conf is probably a key-value store, even though 2.6 is # supposed to use YAML, because the config template is applied - # based on $::mongodb::globals::version which is the user will not + # based on $mongodb::globals::version which is the user will not # necessarily set. This attempts to get the port from both types of # config files. config = YAML.load_file(file) diff --git a/manifests/client.pp b/manifests/client.pp index 6649d9bc5..3d75d667d 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -12,7 +12,7 @@ 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': } - -> anchor { '::mongodb::client::end': } + anchor { 'mongodb::client::start': } + -> class { 'mongodb::client::install': } + -> anchor { 'mongodb::client::end': } } diff --git a/manifests/globals.pp b/manifests/globals.pp index 6c29bdc63..2f0539b88 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -44,7 +44,7 @@ fail('You must set mongodb::globals::version when mongodb::globals::use_enterprise_repo is true') } - class { '::mongodb::repo': + class { 'mongodb::repo': ensure => present, repo_location => $repo_location, proxy => $repo_proxy, diff --git a/manifests/mongos.pp b/manifests/mongos.pp index 53f8336e5..0e38fd450 100644 --- a/manifests/mongos.pp +++ b/manifests/mongos.pp @@ -41,9 +41,9 @@ } } else { anchor { 'mongodb::mongos::start': } - -> class { '::mongodb::mongos::service': } - -> class { '::mongodb::mongos::config': } - -> class { '::mongodb::mongos::install': } + -> class { 'mongodb::mongos::service': } + -> class { 'mongodb::mongos::config': } + -> class { 'mongodb::mongos::install': } -> anchor { 'mongodb::mongos::end': } } diff --git a/manifests/params.pp b/manifests/params.pp index 12ebeef3e..c7ad071ae 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -29,7 +29,7 @@ $pidfilemode = pick($mongodb::globals::pidfilemode, '0644') $manage_pidfile = pick($mongodb::globals::manage_pidfile, true) - $version = $::mongodb::globals::version + $version = $mongodb::globals::version $config_data = undef @@ -38,41 +38,41 @@ 'RedHat', 'Linux', 'Suse': { if $manage_package { - $user = pick($::mongodb::globals::user, 'mongod') - $group = pick($::mongodb::globals::group, 'mongod') + $user = pick($mongodb::globals::user, 'mongod') + $group = pick($mongodb::globals::group, 'mongod') if ($version == undef) { - $server_package_name = pick($::mongodb::globals::server_package_name, 'mongodb-org-server') - $client_package_name = pick($::mongodb::globals::client_package_name, 'mongodb-org-shell') - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, 'mongodb-org-mongos') + $server_package_name = pick($mongodb::globals::server_package_name, 'mongodb-org-server') + $client_package_name = pick($mongodb::globals::client_package_name, 'mongodb-org-shell') + $mongos_package_name = pick($mongodb::globals::mongos_package_name, 'mongodb-org-mongos') $package_ensure = true $package_ensure_client = true $package_ensure_mongos = true } else { # check if the version is greater than 2.6 if $version and (versioncmp($version, '2.6.0') >= 0) { - $server_package_name = pick($::mongodb::globals::server_package_name, 'mongodb-org-server') - $client_package_name = pick($::mongodb::globals::client_package_name, 'mongodb-org-shell') - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, 'mongodb-org-mongos') + $server_package_name = pick($mongodb::globals::server_package_name, 'mongodb-org-server') + $client_package_name = pick($mongodb::globals::client_package_name, 'mongodb-org-shell') + $mongos_package_name = pick($mongodb::globals::mongos_package_name, 'mongodb-org-mongos') $package_ensure = $version $package_ensure_client = $version $package_ensure_mongos = $version } else { - $server_package_name = pick($::mongodb::globals::server_package_name, 'mongodb-10gen') - $client_package_name = pick($::mongodb::globals::client_package_name, 'mongodb-10gen') - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, 'mongodb-10gen') + $server_package_name = pick($mongodb::globals::server_package_name, 'mongodb-10gen') + $client_package_name = pick($mongodb::globals::client_package_name, 'mongodb-10gen') + $mongos_package_name = pick($mongodb::globals::mongos_package_name, 'mongodb-10gen') $package_ensure = $version $package_ensure_client = $version #this is still needed in case they are only installing the client $package_ensure_mongos = $version } } - $service_name = pick($::mongodb::globals::service_name, 'mongod') - $mongos_service_name = pick($::mongodb::globals::mongos_service_name, 'mongos') + $service_name = pick($mongodb::globals::service_name, 'mongod') + $mongos_service_name = pick($mongodb::globals::mongos_service_name, 'mongos') $config = '/etc/mongod.conf' $mongos_config = '/etc/mongodb-shard.conf' $dbpath = '/var/lib/mongodb' $logpath = '/var/log/mongodb/mongod.log' $pidfilepath = '/var/run/mongodb/mongod.pid' - $bind_ip = pick($::mongodb::globals::bind_ip, ['127.0.0.1']) + $bind_ip = pick($mongodb::globals::bind_ip, ['127.0.0.1']) $fork = true $mongos_pidfilepath = undef $mongos_unixsocketprefix = undef @@ -90,15 +90,15 @@ $package_ensure_client = $version $package_ensure_mongos = $version } - $user = pick($::mongodb::globals::user, 'mongodb') - $group = pick($::mongodb::globals::group, 'mongodb') - $server_package_name = pick($::mongodb::globals::server_package_name, 'mongodb-server') - $client_package_name = pick($::mongodb::globals::client_package_name, 'mongodb') - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, 'mongodb-server') - $service_name = pick($::mongodb::globals::service_name, 'mongod') + $user = pick($mongodb::globals::user, 'mongodb') + $group = pick($mongodb::globals::group, 'mongodb') + $server_package_name = pick($mongodb::globals::server_package_name, 'mongodb-server') + $client_package_name = pick($mongodb::globals::client_package_name, 'mongodb') + $mongos_package_name = pick($mongodb::globals::mongos_package_name, 'mongodb-server') + $service_name = pick($mongodb::globals::service_name, 'mongod') $dbpath = '/var/lib/mongodb' $logpath = '/var/log/mongodb/mongodb.log' - $bind_ip = pick($::mongodb::globals::bind_ip, ['127.0.0.1']) + $bind_ip = pick($mongodb::globals::bind_ip, ['127.0.0.1']) if ($::operatingsystem == 'fedora' and versioncmp($::operatingsystemrelease, '22') >= 0 or $::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7.0') >= 0) { $config = '/etc/mongod.conf' @@ -123,49 +123,49 @@ } 'Debian': { if $manage_package { - $user = pick($::mongodb::globals::user, 'mongodb') - $group = pick($::mongodb::globals::group, 'mongodb') + $user = pick($mongodb::globals::user, 'mongodb') + $group = pick($mongodb::globals::group, 'mongodb') if $mongodb::globals::use_enterprise_repo == true { $edition = 'enterprise' } else { $edition = 'org' } if ($version == undef) { - $server_package_name = pick($::mongodb::globals::server_package_name, "mongodb-${edition}-server") - $client_package_name = pick($::mongodb::globals::client_package_name, "mongodb-${edition}-shell") - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, "mongodb-${edition}-mongos") + $server_package_name = pick($mongodb::globals::server_package_name, "mongodb-${edition}-server") + $client_package_name = pick($mongodb::globals::client_package_name, "mongodb-${edition}-shell") + $mongos_package_name = pick($mongodb::globals::mongos_package_name, "mongodb-${edition}-mongos") $package_ensure = true $package_ensure_client = true $package_ensure_mongos = true - $service_name = pick($::mongodb::globals::service_name, 'mongod') + $service_name = pick($mongodb::globals::service_name, 'mongod') $config = '/etc/mongod.conf' } else { # check if the version is greater than 2.6 if $version and (versioncmp($version, '2.6.0') >= 0) { - $server_package_name = pick($::mongodb::globals::server_package_name, "mongodb-${edition}-server") - $client_package_name = pick($::mongodb::globals::client_package_name, "mongodb-${edition}-shell") - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, "mongodb-${edition}-mongos") + $server_package_name = pick($mongodb::globals::server_package_name, "mongodb-${edition}-server") + $client_package_name = pick($mongodb::globals::client_package_name, "mongodb-${edition}-shell") + $mongos_package_name = pick($mongodb::globals::mongos_package_name, "mongodb-${edition}-mongos") $package_ensure = $version $package_ensure_client = $version $package_ensure_mongos = $version - $service_name = pick($::mongodb::globals::service_name, 'mongod') + $service_name = pick($mongodb::globals::service_name, 'mongod') $config = '/etc/mongod.conf' } else { - $server_package_name = pick($::mongodb::globals::server_package_name, 'mongodb-10gen') - $client_package_name = pick($::mongodb::globals::client_package_name, 'mongodb-10gen') - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, 'mongodb-10gen') + $server_package_name = pick($mongodb::globals::server_package_name, 'mongodb-10gen') + $client_package_name = pick($mongodb::globals::client_package_name, 'mongodb-10gen') + $mongos_package_name = pick($mongodb::globals::mongos_package_name, 'mongodb-10gen') $package_ensure = $version $package_ensure_client = $version #this is still needed in case they are only installing the client - $service_name = pick($::mongodb::globals::service_name, 'mongodb') + $service_name = pick($mongodb::globals::service_name, 'mongodb') $config = '/etc/mongodb.conf' } } - $mongos_service_name = pick($::mongodb::globals::mongos_service_name, 'mongos') + $mongos_service_name = pick($mongodb::globals::mongos_service_name, 'mongos') $mongos_config = '/etc/mongodb-shard.conf' $dbpath = '/var/lib/mongodb' $logpath = '/var/log/mongodb/mongodb.log' - $pidfilepath = pick($::mongodb::globals::pidfilepath, '/var/run/mongod.pid') - $bind_ip = pick($::mongodb::globals::bind_ip, ['127.0.0.1']) + $pidfilepath = pick($mongodb::globals::pidfilepath, '/var/run/mongod.pid') + $bind_ip = pick($mongodb::globals::bind_ip, ['127.0.0.1']) } else { # although we are living in a free world, # I would not recommend to use the prepacked @@ -180,19 +180,19 @@ $package_ensure_client = $version $package_ensure_mongos = $version } - $user = pick($::mongodb::globals::user, 'mongodb') - $group = pick($::mongodb::globals::group, 'mongodb') - $server_package_name = pick($::mongodb::globals::server_package_name, 'mongodb-server') - $client_package_name = $::mongodb::globals::client_package_name - $mongos_package_name = pick($::mongodb::globals::mongos_package_name, 'mongodb-server') - $service_name = pick($::mongodb::globals::service_name, 'mongodb') - $mongos_service_name = pick($::mongodb::globals::mongos_service_name, 'mongos') + $user = pick($mongodb::globals::user, 'mongodb') + $group = pick($mongodb::globals::group, 'mongodb') + $server_package_name = pick($mongodb::globals::server_package_name, 'mongodb-server') + $client_package_name = $mongodb::globals::client_package_name + $mongos_package_name = pick($mongodb::globals::mongos_package_name, 'mongodb-server') + $service_name = pick($mongodb::globals::service_name, 'mongodb') + $mongos_service_name = pick($mongodb::globals::mongos_service_name, 'mongos') $config = '/etc/mongodb.conf' $mongos_config = '/etc/mongodb-shard.conf' $dbpath = '/var/lib/mongodb' $logpath = '/var/log/mongodb/mongodb.log' - $bind_ip = pick($::mongodb::globals::bind_ip, ['127.0.0.1']) - $pidfilepath = $::mongodb::globals::pidfilepath + $bind_ip = pick($mongodb::globals::bind_ip, ['127.0.0.1']) + $pidfilepath = $mongodb::globals::pidfilepath } # avoid using fork because of the init scripts design $fork = undef diff --git a/manifests/repo.pp b/manifests/repo.pp index 3e939d83e..ce5d32278 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -36,7 +36,7 @@ $description = 'MongoDB/10gen Repository' } - class { '::mongodb::repo::yum': } + class { 'mongodb::repo::yum': } } 'Debian': { @@ -81,7 +81,7 @@ $key = '492EAFE8CD016A07919F1D2B9ECBEC467F0CEB10' $key_server = 'hkp://keyserver.ubuntu.com:80' } - class { '::mongodb::repo::apt': } + class { 'mongodb::repo::apt': } } default: { diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp index 184f3654e..c3ad969c3 100644 --- a/manifests/repo/apt.pp +++ b/manifests/repo/apt.pp @@ -5,14 +5,14 @@ include ::apt - if($::mongodb::repo::ensure == 'present' or $::mongodb::repo::ensure == true) { + if($mongodb::repo::ensure == 'present' or $mongodb::repo::ensure == true) { apt::source { 'mongodb': - location => $::mongodb::repo::location, - release => $::mongodb::repo::release, - repos => $::mongodb::repo::repos, + location => $mongodb::repo::location, + release => $mongodb::repo::release, + repos => $mongodb::repo::repos, key => { - 'id' => $::mongodb::repo::key, - 'server' => $::mongodb::repo::key_server, + 'id' => $mongodb::repo::key, + 'server' => $mongodb::repo::key_server, }, } diff --git a/manifests/repo/yum.pp b/manifests/repo/yum.pp index 6046e9a3e..7ee32ebf7 100644 --- a/manifests/repo/yum.pp +++ b/manifests/repo/yum.pp @@ -3,15 +3,15 @@ # We try to follow/reproduce the instruction # http://docs.mongodb.org/manual/tutorial/install-mongodb-on-red-hat-centos-or-fedora-linux/ - if($::mongodb::repo::ensure == 'present' or $::mongodb::repo::ensure == true) { + if($mongodb::repo::ensure == 'present' or $mongodb::repo::ensure == true) { yumrepo { 'mongodb': - descr => $::mongodb::repo::description, - baseurl => $::mongodb::repo::location, + descr => $mongodb::repo::description, + baseurl => $mongodb::repo::location, gpgcheck => '0', enabled => '1', - proxy => $::mongodb::repo::proxy, - proxy_username => $::mongodb::repo::proxy_username, - proxy_password => $::mongodb::repo::proxy_password, + proxy => $mongodb::repo::proxy, + proxy_username => $mongodb::repo::proxy_username, + proxy_password => $mongodb::repo::proxy_password, } Yumrepo['mongodb'] -> Package<|tag == 'mongodb'|> } diff --git a/manifests/server.pp b/manifests/server.pp index d1a4eb949..38c0b53db 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -98,9 +98,9 @@ } } else { anchor { 'mongodb::server::start': } - -> class { '::mongodb::server::service': } - -> class { '::mongodb::server::config': } - -> class { '::mongodb::server::install': } + -> class { 'mongodb::server::service': } + -> class { 'mongodb::server::config': } + -> class { 'mongodb::server::install': } -> anchor { 'mongodb::server::end': } }