From 0c9066661756222b7902c33ed0532abcb36f3b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Mon, 23 Sep 2019 13:49:31 +0200
Subject: [PATCH] Update log-driver value for podman

Depending on the podman version, "json-file" is set to noop and makes
podman crash (true for at least podman 1.4.1), while older versions
re-add this json-file as an alias to k8s-file (true since 1.4.3).

Ensuiring we're using k8s-file will prevent issues depending on the
podman version.

Relates to https://bugzilla.redhat.com/show_bug.cgi?id=1754416
Closes-Bug: #1844856

Change-Id: I70eba8af06741ed81173689a03c4867421917cd6
(cherry picked from commit 0976e4eeb3421873ad487d01ce85b0ec94d735ce)
---
 templates/neutron/dibbler-client.epp | 2 +-
 templates/neutron/dnsmasq.epp        | 2 +-
 templates/neutron/haproxy.epp        | 2 +-
 templates/neutron/keepalived.epp     | 2 +-
 templates/neutron/radvd.epp          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/neutron/dibbler-client.epp b/templates/neutron/dibbler-client.epp
index e416dd013..d37287fe7 100644
--- a/templates/neutron/dibbler-client.epp
+++ b/templates/neutron/dibbler-client.epp
@@ -28,7 +28,7 @@ LOGGING=''
 CMD="ip netns exec ${NETNS} /usr/sbin/dibbler-client run"
 <%- } elsif $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
-LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
+LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/dibbler-client run'
 <%- } else { -%>
 CLI='echo noop'
diff --git a/templates/neutron/dnsmasq.epp b/templates/neutron/dnsmasq.epp
index 2b9b898a3..1ca53a6a9 100644
--- a/templates/neutron/dnsmasq.epp
+++ b/templates/neutron/dnsmasq.epp
@@ -25,7 +25,7 @@ LOGGING=''
 CMD="ip netns exec ${NETNS} /usr/sbin/dnsmasq -k"
 <%- } elsif $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
-LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
+LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/dnsmasq -k'
 <%- } else { -%>
 CLI='echo noop'
diff --git a/templates/neutron/haproxy.epp b/templates/neutron/haproxy.epp
index c4359e71d..b736f4f3e 100644
--- a/templates/neutron/haproxy.epp
+++ b/templates/neutron/haproxy.epp
@@ -26,7 +26,7 @@ LOGGING=''
 CMD="ip netns exec ${NETNS} "'$HAPROXY'
 <%- } elsif $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
-LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
+LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='$HAPROXY'
 <%- } else { -%>
 CLI='echo noop'
diff --git a/templates/neutron/keepalived.epp b/templates/neutron/keepalived.epp
index 599038c72..97798c8a5 100644
--- a/templates/neutron/keepalived.epp
+++ b/templates/neutron/keepalived.epp
@@ -25,7 +25,7 @@ LOGGING=''
 CMD="ip netns exec ${NETNS} /usr/sbin/keepalived -n -l -D"
 <%- } elsif $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
-LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
+LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/keepalived -n -l -D'
 <%- } else { -%>
 CLI='echo noop'
diff --git a/templates/neutron/radvd.epp b/templates/neutron/radvd.epp
index 03b40e7c9..391e092f4 100644
--- a/templates/neutron/radvd.epp
+++ b/templates/neutron/radvd.epp
@@ -25,7 +25,7 @@ LOGGING=''
 CMD="ip netns exec qrouter-${NETWORK_ID} /usr/sbin/radvd -n"
 <%- } elsif $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
-LOGGING="--log-driver json-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
+LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/radvd -n'
 <%- } else { -%>
 CLI='echo noop'