openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Podman support in haproxy-public-tls-inject"

Browse Source
This commit is contained in:
Zuul 2019-02-22 05:08:03 +00:00 committed by Gerrit Code Review
commit 85f5ec6609
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/haproxy/haproxy-public-tls-inject.yaml
View File

@ -104,10 +104,10 @@ outputs:
- name: get container_id - name: get container_id
when: when:
- docker_state.status.ActiveState == 'active' - docker_state.status.ActiveState == 'active' or container_cli == 'podman
- attr_cert_path.stat.exists - attr_cert_path.stat.exists
- attr_cert_path.stat.isdir == False - attr_cert_path.stat.isdir == False
command: docker ps -q -f name=haproxy command: "{{ container_cli }} ps -q -f name=haproxy"
register: container_id register: container_id
- name: get pcs resource name for haproxy container - name: get pcs resource name for haproxy container
@ -210,5 +210,5 @@ outputs:
when: kolla_cert_exists.stat.exists when: kolla_cert_exists.stat.exists
- name: send restart order to haproxy container - 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 when: kolla_cert_exists.stat.exists