Update mongodb to 1ae7406589e3abf6f65a337005217ca0e0323840

1ae7406589e3abf6f65a337005217ca0e0323840 Merge pull request redhat-openstack#183 from xbezdick/master
f6fa7dfe9006d7c5bdeb84aa354e79fa54602bd5 Add support for ipv6

Puppetfile

@@ -91,7 +91,7 @@ mod 'module-data',
   :git => 'https://github.com/ripienaar/puppet-module-data.git'
 
 mod 'mongodb',
-  :commit => 'e4c2f0809a7c44c1c940d50f8108d1a448d79dfb',
+  :commit => '1ae7406589e3abf6f65a337005217ca0e0323840',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',

mongodb/README.md

@@ -179,6 +179,10 @@ This setting can be used to override the default MongoDB user group to be used
 for related files in the file system. If not specified, the module will use
 the default for your OS distro.
 
+#####`ipv6`
+This setting is used to configure MongoDB to turn on ipv6 support. If not specified
+and ipv6 address is passed to MongoDB bind_ip it will just fail.
+
 #####`bind_ip`
 This setting can be used to configure MonogDB process to bind to and listen
 for connections from applications on this address. If not specified, the
@@ -217,6 +221,10 @@ Specify the path to a file name for the log file that will hold all diagnostic
 logging information. Unless specified, mongod will output all log information
 to the standard output.
 
+#####`ipv6`
+This setting has to be true to configure MongoDB to turn on ipv6 support. If not specified
+and ipv6 address is passed to MongoDB bind_ip it will just fail.
+
 #####`bind_ip`
 Set this option to configure the mongod or mongos process to bind to and listen
 for connections from applications on this address. If not specified, the module

mongodb/lib/puppet/util/mongodb_validator.rb

@@ -1,6 +1,6 @@
 require 'socket'
 require 'timeout'
-
+require 'ipaddr'
 
 module Puppet
   module Util
@@ -9,7 +9,7 @@ class MongodbValidator
       attr_reader :mongodb_port
 
       def initialize(mongodb_server, mongodb_port)
-        @mongodb_server = mongodb_server
+        @mongodb_server = IPAddr.new(mongodb_server).to_s
         @mongodb_port   = mongodb_port
       end
 

mongodb/manifests/globals.pp

@@ -15,6 +15,7 @@
 
   $user                 = undef,
   $group                = undef,
+  $ipv6                 = undef,
   $bind_ip              = undef,
 
   $version              = undef,

mongodb/manifests/init.pp

@@ -80,6 +80,7 @@
   $slowms          = undef,
   $keyfile         = undef,
   $key             = undef,
+  $ipv6            = undef,
   $bind_ip         = undef,
   $pidfilepath     = undef
 ) inherits mongodb::params {
@@ -137,6 +138,7 @@
     slowms          => $slowms,
     keyfile         => $keyfile,
     key             => $key,
+    ipv6            => $ipv6,
     bind_ip         => $bind_ip,
     pidfilepath     => $pidfilepath,
   }

mongodb/manifests/params.pp

@@ -2,6 +2,7 @@
 class mongodb::params inherits mongodb::globals {
   $ensure                = true
   $mongos_ensure         = true
+  $ipv6                  = undef
   $service_enable        = pick($mongodb::globals::service_enable, true)
   $service_ensure        = pick($mongodb::globals::service_ensure, 'running')
   $service_status        = $mongodb::globals::service_status

mongodb/manifests/server.pp

@@ -20,6 +20,7 @@
 
   $logpath         = $mongodb::params::logpath,
   $bind_ip         = $mongodb::params::bind_ip,
+  $ipv6            = undef,
   $logappend       = true,
   $fork            = $mongodb::params::fork,
   $port            = undef,

mongodb/manifests/server/config.pp

@@ -46,6 +46,7 @@
   $slowms          = $mongodb::server::slowms
   $keyfile         = $mongodb::server::keyfile
   $key             = $mongodb::server::key
+  $ipv6            = $mongodb::server::ipv6
   $bind_ip         = $mongodb::server::bind_ip
   $directoryperdb  = $mongodb::server::directoryperdb
   $profile         = $mongodb::server::profile

mongodb/spec/classes/server_config_spec.rb

@@ -39,6 +39,15 @@
 
   end
 
+  describe 'with specific bind_ip values and ipv6' do
+    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $bind_ip = ['127.0.0.1', 'fd00:beef:dead:55::143'] $ipv6 = true }", "include mongodb::server"]}
+
+    it {
+      should contain_file('/etc/mongod.conf').with_content(/bind_ip\s=\s127\.0\.0\.1\,fd00:beef:dead:55::143/)
+      should contain_file('/etc/mongod.conf').with_content(/ipv6=true/)
+    }
+  end
+
   describe 'with specific bind_ip values' do
     let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $bind_ip = ['127.0.0.1', '10.1.1.13']}", "include mongodb::server"]}
 

mongodb/templates/mongodb.conf.2.6.erb

@@ -78,6 +78,9 @@ security.javascriptEnabled: <%= @noscripting %>
 
 
 # Net
+<% if @ipv6 -%>
+net.ipv6=<%= @ipv6 %>
+<% end -%>
 <% if @bind_ip -%>
 net.bindIp:  <%= Array(@bind_ip).join(',') %>
 <% end -%>

mongodb/templates/mongodb.conf.erb

@@ -8,6 +8,9 @@ logpath=<%= @logpath %>
 logappend=<%= @logappend %>
 <% end -%>
 <% end -%>
+<% if @ipv6 -%>
+ipv6=<%= @ipv6 %>
+<% end -%>
 <% if @bind_ip -%>
 # Set this option to configure the mongod or mongos process to bind to and
 # listen for connections from applications on this address.