summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2018-06-05 22:38:48 +0200
committerColleen Murphy <colleen@gazlene.net>2018-06-05 22:38:48 +0200
commitf0cd27f06080172100665ec5831e7d9b9a3364de (patch)
treec0b7a48a6c06618592a2122621165d8c5f281f91
parent7fbe25598bee1e736b427a4715d7b4befd9645dc (diff)
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
Notes
Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 12 Jun 2018 21:53:40 +0000 Reviewed-on: https://review.openstack.org/572856 Project: openstack-infra/ansible-role-puppet Branch: refs/heads/master
-rw-r--r--defaults/main.yml1
-rw-r--r--templates/puppet.conf.j23
2 files changed, 4 insertions, 0 deletions
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/'
16puppet_environment_basedir: '/opt/system-config/' 16puppet_environment_basedir: '/opt/system-config/'
17puppet_environment: production 17puppet_environment: production
18puppet_timeout: 30m 18puppet_timeout: 30m
19futureparser: 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 }}
15{% if puppet_environmentpath != '' %} 15{% if puppet_environmentpath != '' %}
16environmentpath={{ puppet_environmentpath }} 16environmentpath={{ puppet_environmentpath }}
17{% endif %} 17{% endif %}
18{% if puppet_version != '4' and futureparser == True %}
19parser = future
20{% endif %}
18 21
19[master] 22[master]
20# These are needed when the puppetmaster is run by passenger 23# These are needed when the puppetmaster is run by passenger