de00bf491d
Currently, we have a lot of logic for checking if a handler should run, depending on whether config files have changed and whether the container configuration has changed. As rm_work pointed out during the recent haproxy refactor, these conditionals are typically unnecessary - we can rely on Ansible's handler notification system to only trigger handlers when they need to run. This removes a lot of error prone code. This patch removes conditional handler logic for all services. It is important to ensure that we no longer trigger handlers when unnecessary, because without these checks in place it will trigger a restart of the containers. Implements: blueprint simplify-handlers Change-Id: I4f1aa03e9a9faaf8aecd556dfeafdb834042e4cd
99 lines
3.6 KiB
YAML
99 lines
3.6 KiB
YAML
---
|
|
- name: Restart ovsdpdk-db container
|
|
vars:
|
|
service_name: "ovsdpdk-db"
|
|
service: "{{ ovsdpdk_services[service_name] }}"
|
|
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"
|
|
notify:
|
|
- Waiting the ovs db service to be ready
|
|
- Ensuring ovsdpdk bridges are properly setup indexed
|
|
- Restart ovsdpdk-vswitchd container
|
|
- Ensuring ovsdpdk bridges are properly setup named
|
|
- wait for dpdk tunnel ip
|
|
- ovs-dpdk gather facts
|
|
|
|
- name: Waiting the ovs db service to be ready
|
|
vars:
|
|
service_name: "ovsdpdk-db"
|
|
service: "{{ ovsdpdk_services[service_name] }}"
|
|
become: true
|
|
command: docker exec "{{ service.container_name }}" ovs-vsctl --no-wait show
|
|
register: check_result
|
|
until: check_result is success
|
|
changed_when: False
|
|
retries: 30
|
|
delay: 2
|
|
|
|
- name: Ensuring ovsdpdk bridges are properly setup indexed
|
|
vars:
|
|
service_name: "ovsdpdk-db"
|
|
service: "{{ ovsdpdk_services[service_name] }}"
|
|
become: true
|
|
command: "docker exec {{ service.container_name }} /bin/sh -c 'CONFIG_FILE={{ container_config_directory }}/ovs-dpdkctl.conf {{ container_config_directory }}/ovs-dpdkctl.sh init'"
|
|
register: status
|
|
changed_when: status.stdout.find('changed') != -1
|
|
when:
|
|
- (inventory_hostname in groups['compute']
|
|
or (enable_manila | bool and inventory_hostname in groups['manila-share'])
|
|
or inventory_hostname in groups['neutron-dhcp-agent']
|
|
or inventory_hostname in groups['neutron-l3-agent']
|
|
or inventory_hostname in groups['neutron-metadata-agent'])
|
|
- ovs_physical_port_policy == 'indexed'
|
|
|
|
- name: Restart ovsdpdk-vswitchd container
|
|
vars:
|
|
service_name: "ovsdpdk-vswitchd"
|
|
service: "{{ ovsdpdk_services[service_name] }}"
|
|
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(True) }}"
|
|
dimensions: "{{ service.dimensions }}"
|
|
when:
|
|
- kolla_action != "config"
|
|
|
|
- name: Ensuring ovsdpdk bridges are properly setup named
|
|
vars:
|
|
service_name: "ovsdpdk-db"
|
|
service: "{{ ovsdpdk_services[service_name] }}"
|
|
become: true
|
|
command: "docker exec {{ service.container_name }} /bin/sh -c 'CONFIG_FILE={{ container_config_directory }}/ovs-dpdkctl.conf {{ container_config_directory }}/ovs-dpdkctl.sh init'"
|
|
register: status
|
|
changed_when: status.stdout.find('changed') != -1
|
|
when:
|
|
- (inventory_hostname in groups['compute']
|
|
or (enable_manila | bool and inventory_hostname in groups['manila-share'])
|
|
or inventory_hostname in groups['neutron-dhcp-agent']
|
|
or inventory_hostname in groups['neutron-l3-agent']
|
|
or inventory_hostname in groups['neutron-metadata-agent'])
|
|
- ovs_physical_port_policy == 'named'
|
|
|
|
- name: wait for dpdk tunnel ip
|
|
wait_for:
|
|
host: "{{ dpdk_tunnel_interface_address }}"
|
|
timeout: 300
|
|
sleep: 5
|
|
|
|
- name: ovs-dpdk gather facts
|
|
setup:
|
|
filter: ansible_*
|
|
when:
|
|
- (inventory_hostname in groups['compute']
|
|
or (enable_manila | bool and inventory_hostname in groups['manila-share'])
|
|
or inventory_hostname in groups['neutron-dhcp-agent']
|
|
or inventory_hostname in groups['neutron-l3-agent']
|
|
or inventory_hostname in groups['neutron-metadata-agent'])
|