openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Avoid ovs restart during package upgrade"

Browse Source
This commit is contained in:
Zuul 2022-10-18 16:16:14 +00:00 committed by Gerrit Code Review
commit 5baba40337
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handlers/main.yml
View File

@ -70,6 +70,14 @@
- "Restart neutron services" - "Restart neutron services"
- "venv changed" - "venv changed"
- name: Restart openvswitch
service:
name: "{{ neutron_ovs_service_name }}"
state: restarted
listen:
- "Restart provider services"
when: neutron_needs_openvswitch | bool
- name: Symlink neutron config directory - name: Symlink neutron config directory
file: file:
# NOTE(cloudnull): The "src" path is relative. This ensures all files remain # NOTE(cloudnull): The "src" path is relative. This ensures all files remain

5
tasks/neutron_install.yml
View File

@ -29,12 +29,16 @@
package: package:
name: "{{ neutron_package_list }}" name: "{{ neutron_package_list }}"
state: "{{ neutron_package_state }}" state: "{{ neutron_package_state }}"
policy_rc_d: "{{ (neutron_needs_openvswitch | bool and ansible_facts['pkg_mgr'] == 'apt') | ternary(101, omit) }}"
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}" update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}" cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}"
register: install_packages register: install_packages
until: install_packages is success until: install_packages is success
retries: 5 retries: 5
delay: 2 delay: 2
notify:
- "Restart neutron services"
- "Restart provider services"
- name: Remove known problem packages - name: Remove known problem packages
package: package:
@ -70,7 +74,6 @@
venv_build_constraints: "{{ _u_c_contents.content.split('\n') | reject('match', '^(ceilometer|neutron)=') | list }}" venv_build_constraints: "{{ _u_c_contents.content.split('\n') | reject('match', '^(ceilometer|neutron)=') | list }}"
venv_build_distro_package_list: "{{ neutron_devel_distro_packages }}" venv_build_distro_package_list: "{{ neutron_devel_distro_packages }}"
venv_install_destination_path: "{{ neutron_bin | dirname }}" venv_install_destination_path: "{{ neutron_bin | dirname }}"
venv_install_distro_package_list: "{{ neutron_package_list }}"
venv_pip_install_args: "{{ neutron_pip_install_args }}" venv_pip_install_args: "{{ neutron_pip_install_args }}"
venv_pip_packages: "{{ neutron_venv_packages }}" venv_pip_packages: "{{ neutron_venv_packages }}"
venv_facts_when_changed: venv_facts_when_changed: