openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[train-only] Ensure we stop ovn-controller with cleanup" into stable/train

This commit is contained in:
Zuul 2021-02-25 17:50:56 +00:00 committed by Gerrit Code Review
parent 8872de03e3 988d5dc892
commit 18964c0563
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -318,6 +318,28 @@ outputs:
persistent: yes
state: yes
upgrade_tasks:
# system_upgrade
- name: ovn_controller system_upgrade_prepare step 1
tags:
- never
- system_upgrade
- system_upgrade_prepare
when:
- step|int == 1
block:
- name: Check ovn_controller is running in docker
shell: |
docker ps | grep ovn_controller
register: ovn_controller_running
failed_when: false
- name: Disable autorestart on ovn_controller container
command: docker update --restart=no ovn_controller
when: ovn_controller_running.rc == 0
- name: Tell ovn_controller to clean up and stop
shell: |
docker exec -u root ovn_controller bash -c "if [ -f /usr/bin/ovn-appctl ] ; then ovn-appctl -t ovn-controller exit ; else ovs-appctl -t ovn-controller exit ; fi"
when: ovn_controller_running.rc == 0
# nova_hybrid_state
- name: Gather missing facts
setup:
gather_subset: "distribution"