Merge pull request #498 from voxpupuli/revert-485-fix-upstream

ekohl · web-flow · commit 9b406512ede4 · 2018-10-08T12:57:41.000+02:00
Revert "Fallback to monogb version from fact if no explicit version got provided"
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -67,12 +67,7 @@
   $ssl_invalid_hostnames = $mongodb::server::ssl_invalid_hostnames
   $ssl_mode         = $mongodb::server::ssl_mode
   $storage_engine   = $mongodb::server::storage_engine
-
-  if $mongodb::server::version == undef or $mongodb::server::version == '' {
-    $version = $facts['mongodb_version']
-  } else {
-    $version = $mongodb::server::version
-  }
+  $version          = $mongodb::server::version
 
   File {
     owner => $user,
diff --git a/templates/mongodb.conf.2.6.erb b/templates/mongodb.conf.2.6.erb
@@ -1,5 +1,4 @@
 #mongodb.conf - generated from Puppet
-# Generated for MongoDB version <%= @version %>
 
 #System Log
 
diff --git a/templates/mongodb.conf.erb b/templates/mongodb.conf.erb
@@ -1,5 +1,4 @@
 # mongodb.conf - generated from Puppet
-# Generated for MongoDB version <%= @version %>
 
 
 <% if @logpath -%>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#mongodb.conf - generated from Puppet`
`2`		`-# Generated for MongoDB version <%= @version %>`
`3`	`2`
`4`	`3`	`#System Log`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# mongodb.conf - generated from Puppet`
`2`		`-# Generated for MongoDB version <%= @version %>`
`3`	`2`
`4`	`3`
`5`	`4`	`<% if @logpath -%>`