From 321a7f52844ee6ae2a7a3b3074ee8d4e00c8611b Mon Sep 17 00:00:00 2001 From: Jacek Tomasiak Date: Fri, 12 Aug 2016 14:01:18 +0200 Subject: [PATCH] Removed unneeded vlan settings from neutron config The network_vlan_ranges settings doesn't seem to be needed for Ironic setup (anymore). There was some old code in Neutron which used this parameter even for flat (i.e. non-vlan) networks but it looks like it's long gone. Before change: I2812548326141d2212d04f34d5448fb974d298e0 all physical networks had to be listed in network_vlan_ranges. After this change this check was applied to VLAN and FLAT networks. Change: Ia8cae480180f0990af7d5e5e56f29eaeac205e0e introduced ML2 plugin which replaces monolithic OVS plugin. In this version, FLAT and VLAN is split into separate drivers and FLAT driver doesn't mention network_vlan_ranges at all. Change: I8b519cb2bbebcbec2c78bb0ec9325716970736cf removed legacy plugin. Since that point there's no code which requires FLAT networks to be listed in network_vlan_ranges. Change-Id: I674ad6bdd8cbbfa3c590787362bae9588c532caf --- doc/source/deploy/install-guide.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/source/deploy/install-guide.rst b/doc/source/deploy/install-guide.rst index ff5f706bdc..923e4baf5e 100644 --- a/doc/source/deploy/install-guide.rst +++ b/doc/source/deploy/install-guide.rst @@ -572,9 +572,6 @@ An example of this is shown in the `Enrollment`_ section. [ml2_type_flat] flat_networks = physnet1 - [ml2_type_vlan] - network_vlan_ranges = physnet1 - [securitygroup] firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver enable_security_group = True