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
This commit is contained in:
Michal Nasiadka 2020-06-24 15:03:32 +02:00 committed by Mark Goddard
parent f13847a5a2
commit c4c3ceca31
3 changed files with 10 additions and 3 deletions

View File

@ -35,7 +35,7 @@ neutron_services:
host_in_groups: >- host_in_groups: >-
{{ {{
( inventory_hostname in groups['compute'] ( 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-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']

View File

@ -10,7 +10,7 @@ openvswitch_services:
host_in_groups: >- host_in_groups: >-
{{ {{
inventory_hostname in groups['compute'] 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-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -25,7 +25,7 @@ openvswitch_services:
host_in_groups: >- host_in_groups: >-
{{ {{
inventory_hostname in groups['compute'] 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-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']

View File

@ -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 <https://bugs.launchpad.net/kolla-ansible/+bug/1884939>`__