From 3f273df94d0d1bc57da2c3da26122b0a3c8032db Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Sat, 21 Oct 2017 09:15:03 +0100 Subject: [PATCH] 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. --- ansible/group_vars/all/neutron | 5 ++--- doc/source/release-notes.rst | 4 ++++ etc/kayobe/neutron.yml | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ansible/group_vars/all/neutron b/ansible/group_vars/all/neutron index 3282f51cd..ce255f815 100644 --- a/ansible/group_vars/all/neutron +++ b/ansible/group_vars/all/neutron @@ -2,10 +2,9 @@ ############################################################################### # 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: - - openvswitch - - genericswitch # List of Neutron ML2 type drivers to use. kolla_neutron_ml2_type_drivers: diff --git a/doc/source/release-notes.rst b/doc/source/release-notes.rst index 851ac631b..e48cb92cf 100644 --- a/doc/source/release-notes.rst +++ b/doc/source/release-notes.rst @@ -25,6 +25,10 @@ Upgrade Notes to ``True``. Management of the firewall by ironic inspector is important to ensure that DHCP offers are not made to nodes during provisioning by 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 ============ diff --git a/etc/kayobe/neutron.yml b/etc/kayobe/neutron.yml index d295a966c..489ee8f3f 100644 --- a/etc/kayobe/neutron.yml +++ b/etc/kayobe/neutron.yml @@ -2,7 +2,8 @@ ############################################################################### # 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: # List of Neutron ML2 type drivers to use.