From f0cd27f06080172100665ec5831e7d9b9a3364de Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Tue, 5 Jun 2018 22:38:48 +0200 Subject: [PATCH] Add parser = future config option to puppet.conf Enable testing puppet 3 with the future parser[1] by adding the boolean parameter 'futureparser' to the role, which will turn on `parser = future` in puppet.conf if set. [1] https://docs.puppet.com/puppet/3.8/experiments_future.html Change-Id: Ia65948ba954457d873758ed08502e844151f5cf5 --- defaults/main.yml | 1 + templates/puppet.conf.j2 | 3 +++ 2 files changed, 4 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 9e7acd0..5530aad 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,3 +16,4 @@ puppet_hiera_datadir: '/opt/system-config/' puppet_environment_basedir: '/opt/system-config/' puppet_environment: production puppet_timeout: 30m +futureparser: False diff --git a/templates/puppet.conf.j2 b/templates/puppet.conf.j2 index ad41108..c600368 100644 --- a/templates/puppet.conf.j2 +++ b/templates/puppet.conf.j2 @@ -15,6 +15,9 @@ basemodulepath = {{ puppet_basemodulepath }} {% if puppet_environmentpath != '' %} environmentpath={{ puppet_environmentpath }} {% endif %} +{% if puppet_version != '4' and futureparser == True %} +parser = future +{% endif %} [master] # These are needed when the puppetmaster is run by passenger