openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use docker_container Ansible module" into stable/queens

This commit is contained in:
Zuul 2019-08-28 00:01:49 +00:00 committed by Gerrit Code Review
parent 2b22127dbf 162541f242
commit 8decb3f2b4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/octavia-api.yaml
View File

@ -206,7 +206,7 @@ outputs:
when: when:
- step|int == 2 - step|int == 2
- internal_tls_enabled|bool - internal_tls_enabled|bool
docker: docker_container:
name: octavia_api_tls_proxy name: octavia_api_tls_proxy
state: absent state: absent
upgrade_tasks: upgrade_tasks:
@ -251,7 +251,7 @@ outputs:
service: name=httpd state=stopped service: name=httpd state=stopped
- name: remove TLS proxy if configured and running - name: remove TLS proxy if configured and running
when: internal_tls_enabled|bool when: internal_tls_enabled|bool
docker: docker_container:
name: octavia_api_tls_proxy name: octavia_api_tls_proxy
state: absent state: absent
metadata_settings: metadata_settings:

5
releasenotes/notes/fix-octavia-update-upgrade-tasks-docker-067489654b2b7e18.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed an issue where the update and upgrade tasks for Octavia would use the
removed docker module in Ansible 2.4.