Use kolla-ansible's defaults for neutron ML2 mechanism drivers

Kolla-ansible has some logic to select appropriate mechanism drivers.
Let's use that logic instead of assigning our own defaults.
This commit is contained in:
Mark Goddard 2017-10-21 09:15:03 +01:00
parent ba6d30c10a
commit 3f273df94d
3 changed files with 8 additions and 4 deletions

View File

@ -2,10 +2,9 @@
############################################################################### ###############################################################################
# Neutron configuration. # Neutron configuration.
# List of Neutron ML2 mechanism drivers to use. # List of Neutron ML2 mechanism drivers to use. If unset the kolla-ansible
# defaults will be used.
kolla_neutron_ml2_mechanism_drivers: kolla_neutron_ml2_mechanism_drivers:
- openvswitch
- genericswitch
# List of Neutron ML2 type drivers to use. # List of Neutron ML2 type drivers to use.
kolla_neutron_ml2_type_drivers: kolla_neutron_ml2_type_drivers:

View File

@ -25,6 +25,10 @@ Upgrade Notes
to ``True``. Management of the firewall by ironic inspector is important to to ``True``. Management of the firewall by ironic inspector is important to
ensure that DHCP offers are not made to nodes during provisioning by ensure that DHCP offers are not made to nodes during provisioning by
inspector's DHCP server. inspector's DHCP server.
* The default list of neutron ML2 mechanism drivers
(``kolla_neutron_ml2_mechanism_drivers``) has been removed in favour of using
the defaults provided by kolla-ansible. Users relying on the default list of
``openvswitch`` and ``genericswitch`` should set the value explicitly.
Kayobe 3.0.0 Kayobe 3.0.0
============ ============

View File

@ -2,7 +2,8 @@
############################################################################### ###############################################################################
# Neutron configuration. # Neutron configuration.
# List of Neutron ML2 mechanism drivers to use. # List of Neutron ML2 mechanism drivers to use. If unset the kolla-ansible
# defaults will be used.
#kolla_neutron_ml2_mechanism_drivers: #kolla_neutron_ml2_mechanism_drivers:
# List of Neutron ML2 type drivers to use. # List of Neutron ML2 type drivers to use.