From c60e80da44d630563298380d4cc9ced2e532ae88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Tue, 16 Apr 2019 14:12:17 +0200
Subject: [PATCH] Correct how podman exec is called for the
 neutron-keepalived-state-change

Podman exec doesn't have the "--detach" flag, so this one didn't work at
all until now.

Change-Id: Ibf18056dc1ed0168b3aa467e7034af7e59c98cb7
(cherry picked from commit f5a7ca6fb54aa062caf1095359119fd072b986da)
---
 templates/neutron/neutron-keepalived-state-change.epp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/templates/neutron/neutron-keepalived-state-change.epp b/templates/neutron/neutron-keepalived-state-change.epp
index 1a2c49c38..91ca043e5 100644
--- a/templates/neutron/neutron-keepalived-state-change.epp
+++ b/templates/neutron/neutron-keepalived-state-change.epp
@@ -19,10 +19,10 @@ ARGS="$@"
 NETNS=$(ip netns identify)
 NAME=neutron-keepalived-${NETNS}
 <%- if $container_cli == 'docker' { -%>
-CLI='docker'
-CMD="ip netns exec ${NETNS} /usr/bin/neutron-keepalived-state-change"
+CLI='docker exec --detach'
+CMD="ip netns exec ${NETNS} /usr/bin/neutron-keepalived-state-change exec"
 <%- } elsif $container_cli == 'podman' { -%>
-CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
+CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman exec"
 CMD='/usr/bin/neutron-keepalived-state-change'
 <%- } else { -%>
 CLI='echo noop'
@@ -41,8 +41,7 @@ then
     exit 0
 fi
 
-$CLI exec --detach \
-    -u root \
+$CLI -u root \
     --privileged \
     $NAME \
     $CMD $ARGS