From 6d1a98902b54ef59d41262fc38d5a839c976ba24 Mon Sep 17 00:00:00 2001
From: Bart-Jan Vrielink <bartjan@vrielink.net>
Date: Thu, 5 Sep 2024 14:11:01 +0200
Subject: [PATCH] Allow --icc=false option for docker daemon

This used to be possible in version 9.1.0 and older, but got lost in
translation from .erb to .epp templates.

Fixes #989
---
 templates/etc/conf.d/docker.epp            | 2 +-
 templates/etc/conf.d/docker.gentoo.epp     | 2 +-
 templates/etc/default/docker.epp           | 2 +-
 templates/etc/sysconfig/docker.epp         | 2 +-
 templates/etc/sysconfig/docker.systemd.epp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/etc/conf.d/docker.epp b/templates/etc/conf.d/docker.epp
index 0fb46595..bd52492e 100644
--- a/templates/etc/conf.d/docker.epp
+++ b/templates/etc/conf.d/docker.epp
@@ -11,7 +11,7 @@ other_args="<% -%>
  --ip-forward=<%= $ip_forward -%>
  --iptables=<%= $iptables -%>
  --ip-masq=<%= $ip_masq -%>
-<% if $icc { %> --icc=<%= $icc %><% } -%>
+<% unless $icc == undef { %> --icc=<%= $icc %><% } -%>
 <% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } -%>
 <% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } -%>
 <% if $bridge { %> --bridge <%= $bridge %><% } -%>
diff --git a/templates/etc/conf.d/docker.gentoo.epp b/templates/etc/conf.d/docker.gentoo.epp
index 066f169f..acb6bb26 100644
--- a/templates/etc/conf.d/docker.gentoo.epp
+++ b/templates/etc/conf.d/docker.gentoo.epp
@@ -11,7 +11,7 @@ DOCKER_OPTS="<% -%>
  --ip-forward=<%= $ip_forward -%>
  --iptables=<%= $iptables -%>
  --ip-masq=<%= $ip_masq -%>
-<% if $icc { %> --icc=<%= $icc %><% } %>
+<% unless $icc == undef { %> --icc=<%= $icc %><% } %>
 <% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } %>
 <% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } %>
 <% if $bridge { %> --bridge <%= $bridge %><% } %>
diff --git a/templates/etc/default/docker.epp b/templates/etc/default/docker.epp
index b8c3bf0e..08e41dde 100644
--- a/templates/etc/default/docker.epp
+++ b/templates/etc/default/docker.epp
@@ -26,7 +26,7 @@ DOCKER_OPTS="\
  --ip-forward=<%= $ip_forward -%>
  --iptables=<%= $iptables -%>
  --ip-masq=<%= $ip_masq -%>
-<% if $icc { %> --icc=<%= $icc %><% } -%>
+<% unless $icc == undef { %> --icc=<%= $icc %><% } -%>
 <% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } -%>
 <% if $bridge { %> --bridge <%= $bridge %><% } -%>
 <% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } -%>
diff --git a/templates/etc/sysconfig/docker.epp b/templates/etc/sysconfig/docker.epp
index 74ad0875..d9f241bd 100644
--- a/templates/etc/sysconfig/docker.epp
+++ b/templates/etc/sysconfig/docker.epp
@@ -11,7 +11,7 @@ other_args="<% -%>
  --ip-forward=<%= $ip_forward -%>
  --iptables=<%= $iptables -%>
  --ip-masq=<%= $ip_masq -%>
-<% if $icc { %> --icc=<%= $icc %><% } -%>
+<% unless $icc == undef { %> --icc=<%= $icc %><% } -%>
 <% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } -%>
 <% if $bridge { %> --bridge <%= $bridge %><% } -%>
 <% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } -%>
diff --git a/templates/etc/sysconfig/docker.systemd.epp b/templates/etc/sysconfig/docker.systemd.epp
index 56b09d36..8d6840c7 100644
--- a/templates/etc/sysconfig/docker.systemd.epp
+++ b/templates/etc/sysconfig/docker.systemd.epp
@@ -8,7 +8,7 @@ OPTIONS="<% if $root_dir { %><%= $root_dir_flag %> <%= $root_dir %><% } -%>
  --ip-forward=<%= $ip_forward -%>
  --iptables=<%= $iptables -%>
  --ip-masq=<%= $ip_masq -%>
-<% if $icc { %> --icc=<%= $icc %><% } -%>
+<% unless $icc == undef { %> --icc=<%= $icc %><% } -%>
 <% if type($registry_mirror, 'generalized') == String { %> --registry-mirror=<%= $registry_mirror %><% } -%>
 <% if String(type($registry_mirror, 'generalized')).index('Array') == 0 { %><% $registry_mirror.each |$param| { %> --registry-mirror=<%= $param %><% } %><% } -%>
 <% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } -%>