Merge pull request voxpupuli#212 from hunner/fix_nohttpinterface

Fix nohttpinterface on >= 2.6

Author: Morgan Haskel

manifests/server/config.pp

@@ -87,8 +87,92 @@
     if $config_content {
       $cfg_content = $config_content
     } elsif (versioncmp($mongodb::globals::version, '2.6.0') >= 0) {
+      # Template uses:
+      # - $auth
+      # - $bind_ip
+      # - $configsvr
+      # - $dbpath
+      # - $directoryperdb
+      # - $fork
+      # - $ipv6
+      # - $jounal
+      # - $keyfile
+      # - $logappend
+      # - $logpath
+      # - $maxconns
+      # - $nohttpinteface
+      # - $nojournal
+      # - $noprealloc
+      # - $noscripting
+      # - $nssize
+      # - $objcheck
+      # - $oplog_size
+      # - $pidfilepath
+      # - $port
+      # - $profile
+      # - $quota
+      # - $quotafiles
+      # - $replset
+      # - $rest
+      # - $set_parameter
+      # - $shardsvr
+      # - $slowms
+      # - $smallfiles
+      # - $syslog
+      # - $verbose
+      # - $verbositylevel
       $cfg_content = template('mongodb/mongodb.conf.2.6.erb')
     } else {
+      # Template uses:
+      # - $auth
+      # - $bind_ip
+      # - $configsvr
+      # - $cpu
+      # - $dbpath
+      # - $diaglog
+      # - $directoryperdb
+      # - $fork
+      # - $ipv6
+      # - $jounal
+      # - $keyfile
+      # - $logappend
+      # - $logpath
+      # - $master
+      # - $maxconns
+      # - $mms_interval
+      # - $mms_name
+      # - $mms_token
+      # - $noauth
+      # - $nohints
+      # - $nohttpinteface
+      # - $nojournal
+      # - $noprealloc
+      # - $noscripting
+      # - $notablescan
+      # - $nssize
+      # - $objcheck
+      # - $only
+      # - $oplog_size
+      # - $pidfilepath
+      # - $port
+      # - $profile
+      # - $quiet
+      # - $quota
+      # - $quotafiles
+      # - $replset
+      # - $rest
+      # - $set_parameter
+      # - $shardsvr
+      # - $slave
+      # - $slowms
+      # - $smallfiles
+      # - $source
+      # - $ssl
+      # - $ssl_ca
+      # - $ssl_key
+      # - $syslog
+      # - $verbose
+      # - $verbositylevel
       $cfg_content = template('mongodb/mongodb.conf.erb')
     }
 

spec/classes/server_spec.rb

@@ -20,4 +20,41 @@
     it { expect { is_expected.to raise_error(Puppet::Error) } }
   end
 
-end
+  context 'setting nohttpinterface' do
+    it "isn't set when undef" do
+      is_expected.to_not contain_file('/etc/mongodb.conf').with_content(/nohttpinterface/)
+    end
+    context "sets nohttpinterface to true when true" do
+      let(:params) do
+        { :nohttpinterface => true, }
+      end
+      it { is_expected.to contain_file('/etc/mongodb.conf').with_content(/nohttpinterface = true/) }
+    end
+    context "sets nohttpinterface to false when false" do
+      let(:params) do
+        { :nohttpinterface => false, }
+      end
+      it { is_expected.to contain_file('/etc/mongodb.conf').with_content(/nohttpinterface = false/) }
+    end
+    context "on >= 2.6" do
+      let(:pre_condition) do
+        "class { 'mongodb::globals': version => '2.6.6', }"
+      end
+      it "isn't set when undef" do
+        is_expected.to_not contain_file('/etc/mongodb.conf').with_content(/net\.http\.enabled/)
+      end
+      context "sets net.http.enabled false when true" do
+        let(:params) do
+          { :nohttpinterface => true, }
+        end
+        it { is_expected.to contain_file('/etc/mongodb.conf').with_content(/net\.http\.enabled: false/) }
+      end
+      context "sets net.http.enabled true when false" do
+        let(:params) do
+          { :nohttpinterface => false, }
+        end
+        it { is_expected.to contain_file('/etc/mongodb.conf').with_content(/net\.http\.enabled: true/) }
+      end
+    end
+  end
+end

templates/mongodb.conf.2.6.erb

@@ -96,8 +96,8 @@ net.http.RESTInterfaceEnabled: true
 <% if @maxconns -%>
 net.maxIncomingConnections: <%= @maxconns %>
 <% end -%>
-<% if @nohttpinterface -%>
-net.http.enabled: <%= @nohttpinterface %>
+<% if ! @nohttpinterface.nil? -%>
+net.http.enabled: <%= ! @nohttpinterface %>
 <% end -%>
 
 #Replication

templates/mongodb.conf.erb

@@ -87,7 +87,7 @@ oplogSize = <%= @oplog_size %>
 # Ignore query hints
 nohints = <%= @nohints %>
 <% end -%>
-<% if @nohttpinterface -%>
+<% if ! @nohttpinterface.nil? -%>
 # Disable the HTTP interface (Defaults to localhost:27018).
 nohttpinterface = <%= @nohttpinterface %>
 <% end -%>