From a88ed428989a6be8fd2f62a15360e7fdb4410dab Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Wed, 25 Jul 2018 11:38:50 +0200
Subject: [PATCH] Fix template variables for puppet 4

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
---
 templates/ansible.cfg.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/ansible.cfg.erb b/templates/ansible.cfg.erb
index f201d33..7ee1b34 100644
--- a/templates/ansible.cfg.erb
+++ b/templates/ansible.cfg.erb
@@ -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 -%>