From: Felix Dörre <felix@dogcraft.de>
Date: Mon, 6 Nov 2017 10:29:04 +0000 (+0100)
Subject: upd: puppetlabs-stdlib to >=4.21
X-Git-Url: https://code.wpia.club/?p=infra.git;a=commitdiff_plain;h=86a085d6ae79d35d3d8f0ea780d04284d0727db3

upd: puppetlabs-stdlib to >=4.21

Change-Id: I9b5dbc49eb65982fe8530fe2dbcb0146fc91292a
---

diff --git a/bootstrap b/bootstrap
index 4de279d..b4ee644 100755
--- a/bootstrap
+++ b/bootstrap
@@ -34,8 +34,9 @@ fi
 
 
 puppet module install puppetlabs-firewall --version 1
-# pinned to 4.18, as from version 4.19 the "file_line" is not able to remove "search" and "domain" lines from the container's resolv.conf
-puppet module install puppetlabs-stdlib --version 4.18
+# In version 4.19 and 4.20, the "file_line" is not able to remove "search" and "domain" lines from the container's resolv.conf.
+# Since Puppet 4 does not support "union ranges" of versions (only Puppet 5 does, which is currently not included in Debian), require >=4.21.0 and ignore that <=4.18 works as well.
+puppet module install puppetlabs-stdlib --version ">=4.21.0"
 puppet module install puppetlabs-apt --version 2
 puppet module install puppetlabs-postgresql --version 4
 puppet module install puppetlabs-mysql --version 3