Update mongodb to 3bcfc75229c4faffe5ccfe9caf1278a54ef0f7cc

3bcfc75229c4faffe5ccfe9caf1278a54ef0f7cc Merge pull request redhat-openstack#237 from erikanderson/normalize_template_spacing
38ceb81e36bbbb844039e12fb8aebb43cb2cef0d Merge pull request redhat-openstack#232 from GoozeyX/squashed_forpull
2537fc4dc770c1e1a46567691aa7e7f76961fb52 added yum proxy options
9b9f7571aed4401197437659b31d8d5ac3849e4e Normalize spacing in template

Change-Id: I8a0eed4d5951ab63e8c96672e409dcf514876739

Author: xbezdick

Puppetfile

@@ -143,7 +143,7 @@ mod 'module-data',
   :git => 'https://github.com/ripienaar/puppet-module-data.git'
 
 mod 'mongodb',
-  :commit => 'a5d6e5d36fb1007534bca85fd277a678e6c5a2ee',
+  :commit => '3bcfc75229c4faffe5ccfe9caf1278a54ef0f7cc',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',

mongodb/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Unreleased
+### Summary
+- support setting a proxy for yum repositories with or without user/password authentication
+
 ## 2015-06-22 - Release 0.11.0
 ### Summary
 

mongodb/README.md

@@ -232,6 +232,15 @@ the module will use the default for your OS distro.
 This setting can be used to override the default MongoDB repository location.
 If not specified, the module will use the default repository for your OS distro.
 
+#####`repo_proxy`
+This will allow you to set a proxy for your repository in case you are behind a corporate firewall. Currently this is only supported with yum repositories
+
+#####`proxy_username`
+This sets the username for the proxyserver, should authentication be required
+
+#####`proxy_password`
+This sets the password for the proxyserver, should authentication be required
+
 ####Class: mongodb::server
 
 Most of the parameters manipulate the mongod.conf file.

mongodb/manifests/globals.pp

@@ -27,6 +27,9 @@
 
   $manage_package_repo   = undef,
   $manage_package        = undef,
+  $repo_proxy            = undef,
+  $proxy_username        = undef,
+  $proxy_password        = undef,
 
   $repo_location         = undef,
   $use_enterprise_repo   = undef,
@@ -39,6 +42,7 @@
     class { '::mongodb::repo':
       ensure        => present,
       repo_location => $repo_location,
+      proxy         => $repo_proxy,
     }
   }
 }

mongodb/manifests/repo.pp

@@ -1,8 +1,11 @@
 # PRIVATE CLASS: do not use directly
 class mongodb::repo (
-  $ensure        = $mongodb::params::ensure,
-  $version       = $mongodb::params::version,
-  $repo_location = undef,
+  $ensure         = $mongodb::params::ensure,
+  $version        = $mongodb::params::version,
+  $repo_location  = undef,
+  $proxy          = undef,
+  $proxy_username = undef,
+  $proxy_password = undef,
 ) inherits mongodb::params {
   case $::osfamily {
     'RedHat', 'Linux': {

mongodb/manifests/repo/yum.pp

@@ -5,10 +5,13 @@
 
   if($::mongodb::repo::ensure == 'present' or $::mongodb::repo::ensure == true) {
     yumrepo { 'mongodb':
-      descr    => $::mongodb::repo::description,
-      baseurl  => $::mongodb::repo::location,
-      gpgcheck => '0',
-      enabled  => '1',
+      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,
     }
     Yumrepo['mongodb'] -> Package<|tag == 'mongodb'|>
   }

mongodb/spec/classes/repo_spec.rb

@@ -29,4 +29,30 @@
     }
   end
 
+  context 'when yumrepo has a proxy set' do
+    let :facts do
+      {
+        :osfamily        => 'RedHat',
+        :operatingsystem => 'RedHat',
+      }
+    end
+    let :params do
+      {
+        :proxy => 'http://proxy-server:8080',
+        :proxy_username => 'proxyuser1',
+        :proxy_password => 'proxypassword1',
+      }
+    end
+    it {
+      is_expected.to contain_class('mongodb::repo::yum')
+    }
+    it do
+      should contain_yumrepo('mongodb').with({
+        'enabled' => '1',
+        'proxy' => 'http://proxy-server:8080',
+        'proxy_username' => 'proxyuser1',
+        'proxy_password' => 'proxypassword1',
+        })
+    end
+  end
 end

mongodb/templates/mongodb.conf.2.6.erb

@@ -1,6 +1,6 @@
-# mongo.conf - generated from Puppet
+#mongo.conf - generated from Puppet
 
-# System Log
+#System Log
 
 <% if @logpath -%>
 systemLog.path: <%= @logpath %>
@@ -80,7 +80,7 @@ security.javascriptEnabled: <%= @noscripting %>
 <% end -%>
 
 
-# Net
+#Net
 <% if @ipv6 -%>
 net.ipv6=<%= @ipv6 %>
 <% end -%>
@@ -111,7 +111,7 @@ replication.replSetName: <%= @replset %>
 replication.oplogSizeMB: <%= @oplog_size %>
 <% end -%>
 
-# Sharding
+#Sharding
 <% if @configsvr -%>
 sharding.clusterRole: configsvr
 <% end -%>