From c4c3ceca3130245a5623f427f96c87a8ad99ddf7 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 24 Jun 2020 15:03:32 +0200 Subject: [PATCH] Change neutron-ovs-agent deploy only with manila generic backend Change openvswitch & neutron-openvswitch-agent to deploy only with manila generic backend - which uses ovs-vsctl functionality when configuring share servers. Change-Id: I124108cda62b38ea498612ff9ddb07d6122a330c Closes-Bug: #1884939 --- ansible/roles/neutron/defaults/main.yml | 2 +- ansible/roles/openvswitch/defaults/main.yml | 4 ++-- releasenotes/notes/bug-1884939-7c77b8002d3ff52d.yaml | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/bug-1884939-7c77b8002d3ff52d.yaml diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 70c2268e38..675fa7aa84 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -35,7 +35,7 @@ neutron_services: host_in_groups: >- {{ ( inventory_hostname in groups['compute'] - or (enable_manila | bool and inventory_hostname in groups['manila-share']) + or (enable_manila_backend_generic | 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'] diff --git a/ansible/roles/openvswitch/defaults/main.yml b/ansible/roles/openvswitch/defaults/main.yml index b22283050d..eae931043b 100644 --- a/ansible/roles/openvswitch/defaults/main.yml +++ b/ansible/roles/openvswitch/defaults/main.yml @@ -10,7 +10,7 @@ openvswitch_services: host_in_groups: >- {{ inventory_hostname in groups['compute'] - or (enable_manila | bool and inventory_hostname in groups['manila-share']) + or (enable_manila_backend_generic | 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'] @@ -25,7 +25,7 @@ openvswitch_services: host_in_groups: >- {{ inventory_hostname in groups['compute'] - or (enable_manila | bool and inventory_hostname in groups['manila-share']) + or (enable_manila_backend_generic | 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'] diff --git a/releasenotes/notes/bug-1884939-7c77b8002d3ff52d.yaml b/releasenotes/notes/bug-1884939-7c77b8002d3ff52d.yaml new file mode 100644 index 0000000000..012d72d8ba --- /dev/null +++ b/releasenotes/notes/bug-1884939-7c77b8002d3ff52d.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes an issue with Manila deployment starting ``openvswitch`` and + ``neutron-openvswitch-agent`` containers when + ``enable_manila_backend_generic`` was set to ``False``. + `LP#1884939 `__