openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Change neutron-ovs-agent deploy only with manila generic backend" into stable/train

This commit is contained in:
Zuul 2020-06-26 20:29:35 +00:00 committed by Gerrit Code Review
parent 47c573f05e 05a384920e
commit 0df65c4aaf
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/defaults/main.yml
View File

@ -35,7 +35,7 @@ neutron_services:
host_in_groups: >-
{{
( (inventory_hostname in groups['compute'] and nova_compute_virt_type != 'xenapi')
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']

4
ansible/roles/openvswitch/defaults/main.yml
View File

@ -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']

7
releasenotes/notes/bug-1884939-7c77b8002d3ff52d.yaml Normal file
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>`__