openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove the ml2_conf.ini merging for agents"

Browse Source
This commit is contained in:
Zuul 2020-07-08 19:47:02 +00:00 committed by Gerrit Code Review
commit e0f2e7d3df
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/neutron/tasks/config.yml
View File

@ -157,9 +157,6 @@
- "{{ role_path }}/templates/linuxbridge_agent.ini.j2" - "{{ role_path }}/templates/linuxbridge_agent.ini.j2"
- "{{ node_custom_config }}/neutron/linuxbridge_agent.ini" - "{{ node_custom_config }}/neutron/linuxbridge_agent.ini"
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/linuxbridge_agent.ini" - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/linuxbridge_agent.ini"
# TODO(mnasiadka): Remove in V - left to not break existing deployments
- "{{ node_custom_config }}/neutron/ml2_conf.ini"
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/ml2_conf.ini"
dest: "{{ node_config_directory }}/{{ service_name }}/linuxbridge_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/linuxbridge_agent.ini"
mode: "0660" mode: "0660"
when: when:
@ -177,9 +174,6 @@
- "{{ role_path }}/templates/openvswitch_agent.ini.j2" - "{{ role_path }}/templates/openvswitch_agent.ini.j2"
- "{{ node_custom_config }}/neutron/openvswitch_agent.ini" - "{{ node_custom_config }}/neutron/openvswitch_agent.ini"
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/openvswitch_agent.ini" - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/openvswitch_agent.ini"
# TODO(mnasiadka): Remove in V - left to not break existing deployments
- "{{ node_custom_config }}/neutron/ml2_conf.ini"
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/ml2_conf.ini"
dest: "{{ node_config_directory }}/{{ service_name }}/openvswitch_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/openvswitch_agent.ini"
mode: "0660" mode: "0660"
when: when:

7
releasenotes/notes/remove-ml2-agents-config-96f1f90e7d678209.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
Customizing Neutron Linux bridge and Open vSwitch Agents config via
ml2_conf.ini is removed. The config has been split out for these
agents into linuxbridge_agent.ini and openvswitch_agent.ini respectively.
The old behaviour was deprecated in Ussuri for removal in Victoria.