From 8b79a4d51878a77efadbd12c994a41ec2d4a463d Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 8 Oct 2018 12:24:15 +0200 Subject: [PATCH] Revert "Fallback to monogb version from fact if no explicit version got provided" --- manifests/server/config.pp | 7 +------ templates/mongodb.conf.2.6.erb | 1 - templates/mongodb.conf.erb | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/manifests/server/config.pp b/manifests/server/config.pp index adbfdc1a3..3269be1e3 100644 --- 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 index 26db1673e..1fe3a4fb6 100644 --- 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 index 99673fdc3..de34b14f2 100644 --- 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 -%>