From dbf63314d52c8bfbaccf9543f28ee22942ce7ed0 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 20 Feb 2019 14:45:09 -0500 Subject: [PATCH] Podman support in haproxy-public-tls-inject Fix a few Ansible tasks where only Docker were supported. Change-Id: If51e30854fc7ec27b3d12ccda0595ac0ff4b1e20 --- deployment/haproxy/haproxy-public-tls-inject.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/haproxy/haproxy-public-tls-inject.yaml b/deployment/haproxy/haproxy-public-tls-inject.yaml index c23cf295cb..2f21c4c692 100644 --- a/deployment/haproxy/haproxy-public-tls-inject.yaml +++ b/deployment/haproxy/haproxy-public-tls-inject.yaml @@ -104,10 +104,10 @@ outputs: - name: get container_id when: - - docker_state.status.ActiveState == 'active' + - docker_state.status.ActiveState == 'active' or container_cli == 'podman - attr_cert_path.stat.exists - attr_cert_path.stat.isdir == False - command: docker ps -q -f name=haproxy + command: "{{ container_cli }} ps -q -f name=haproxy" register: container_id - name: get pcs resource name for haproxy container @@ -210,5 +210,5 @@ outputs: when: kolla_cert_exists.stat.exists - name: send restart order to haproxy container - command: docker kill --signal=HUP {{container_id.stdout}} + command: "{{ container_cli }} kill --signal=HUP {{container_id.stdout}}" when: kolla_cert_exists.stat.exists