8736817a98
When editing external bridge configuration and running a reconfigure on openvswitch, handler "Ensuring OVS bridge is properly setup" needs to run, but doesn't. This moves the task from handlers to own file and always includes it after running the handlers. Change-Id: Iee39cf00b743ab0776354749c6e162814b5584d8 Closes-Bug: #1794504
56 lines
2.1 KiB
YAML
56 lines
2.1 KiB
YAML
---
|
|
- name: Restart openvswitch-db-server container
|
|
vars:
|
|
service_name: "openvswitch-db-server"
|
|
service: "{{ openvswitch_services[service_name] }}"
|
|
config_json: "{{ openvswitch_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
|
openvswitch_db_container: "{{ check_openvswitch_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
|
become: true
|
|
kolla_docker:
|
|
action: "recreate_or_restart_container"
|
|
common_options: "{{ docker_common_options }}"
|
|
name: "{{ service.container_name }}"
|
|
image: "{{ service.image }}"
|
|
volumes: "{{ service.volumes }}"
|
|
dimensions: "{{ service.dimensions }}"
|
|
when:
|
|
- kolla_action != "config"
|
|
- service.enabled | bool
|
|
- service.host_in_groups | bool
|
|
- config_json | changed
|
|
or openvswitch_db_container | changed
|
|
or openvswitch_start_ovsdb_server | changed
|
|
notify:
|
|
- Waiting for openvswitch_db service to be ready
|
|
|
|
- name: Waiting for openvswitch_db service to be ready
|
|
command: docker exec openvswitch_db ovs-vsctl --no-wait show
|
|
register: check_result
|
|
until: check_result is success
|
|
changed_when: False
|
|
retries: 30
|
|
delay: 2
|
|
|
|
- name: Restart openvswitch-vswitchd container
|
|
vars:
|
|
service_name: "openvswitch-vswitchd"
|
|
service: "{{ openvswitch_services[service_name] }}"
|
|
config_json: "{{ openvswitch_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
|
openvswitch_vswitchd_container: "{{ check_openvswitch_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
|
become: true
|
|
kolla_docker:
|
|
action: "recreate_or_restart_container"
|
|
common_options: "{{ docker_common_options }}"
|
|
name: "{{ service.container_name }}"
|
|
image: "{{ service.image }}"
|
|
volumes: "{{ service.volumes }}"
|
|
privileged: "{{ service.privileged | default(False) }}"
|
|
dimensions: "{{ service.dimensions }}"
|
|
when:
|
|
- kolla_action != "config"
|
|
- service.enabled | bool
|
|
- service.host_in_groups | bool
|
|
- config_json | changed
|
|
or openvswitch_vswitchd_container | changed
|
|
or openvswitch_start_ovs | changed
|