opendev/puppet-ansible
Code Issues Proposed changes

Fix template variables for puppet 4

Browse Source 
On puppet 4, undef will stop evaluating to :undef in the templates and
instead start evaluating to nil, so check for both to cover our bases.

Change-Id: I6e446cf1a15c9cc5e24f93e755fa3000298f7caa
This commit is contained in:
Colleen Murphy 2018-07-25 11:38:50 +02:00
parent f10adeb3a8
commit a88ed42898
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/ansible.cfg.erb
View File

@ -4,9 +4,9 @@ library=/usr/share/ansible
log_path=/var/log/ansible.log
callback_plugins=<%= @ansible_callback_plugins_path %>
roles_path=<%= @ansible_roles_path %>
<% if @retry_files_enabled != :undef -%>
<% if ! [nil, :undef].include?(@retry_files_enabled) -%>
retry_files_enabled=<%= @retry_files_enabled %>
<% end -%>
<% if @retry_files_save_path != :undef -%>
<% if ! [nil, :undef].include?(@retry_files_save_path) -%>
retry_files_save_path=<%= @retry_files_save_path %>
<% end -%>