From c7d92ed6686ace1134167bbae778af68f676d593 Mon Sep 17 00:00:00 2001 From: gugug Date: Mon, 6 Jul 2020 23:47:22 +0800 Subject: [PATCH] Remove the ml2_conf.ini merging for agents planned removal Change-Id: Ib37ea4d42f82096a682cebc724c45c9dd39c8b47 --- ansible/roles/neutron/tasks/config.yml | 6 ------ .../notes/remove-ml2-agents-config-96f1f90e7d678209.yaml | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/remove-ml2-agents-config-96f1f90e7d678209.yaml diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index de8b1e7efe..f63687d76b 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -157,9 +157,6 @@ - "{{ role_path }}/templates/linuxbridge_agent.ini.j2" - "{{ node_custom_config }}/neutron/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" mode: "0660" when: @@ -177,9 +174,6 @@ - "{{ role_path }}/templates/openvswitch_agent.ini.j2" - "{{ node_custom_config }}/neutron/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" mode: "0660" when: diff --git a/releasenotes/notes/remove-ml2-agents-config-96f1f90e7d678209.yaml b/releasenotes/notes/remove-ml2-agents-config-96f1f90e7d678209.yaml new file mode 100644 index 0000000000..3801f57268 --- /dev/null +++ b/releasenotes/notes/remove-ml2-agents-config-96f1f90e7d678209.yaml @@ -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.