From 4306d9190f49e7fadf88669d18effedabc880d3b Mon Sep 17 00:00:00 2001 From: Matt Riedemann <mriedem@us.ibm.com> Date: Wed, 11 Mar 2015 12:15:14 -0700 Subject: [PATCH] neutron: deprecate 'allow_duplicate_networks' config option Commit 322cc9336fe6f6fe9b3f0da33c6b26a3e5ea9b0c added the option for blueprint multiple-if-1-net back in Juno but it doesn't really make sense to have a config option for this. Having multiple ports on the same network associated with the same instance is supported in Neutron, but Nova wasn't handling it before the change, which was arguably a bug fix. With the default of False, we have basically a feature disabled by default which could result in bug reports if someone didn't know this was not supported unless you flip the switch. We should deprecate the config option in Kilo and remove it in Liberty. When we remove it, we should change the default behavior to act as if allow_duplicate_networks=True so the feature just works out of the box. DocImpact: The neutron.allow_duplicate_networks config option is deprecated in Kilo and will be removed in Liberty where the default behavior will be to just allow multiple ports attached to an instance on the same network in Neutron. Change-Id: Ideeb3c137ff68a4497189670be33f6edbb0ccb76 --- nova/network/neutronv2/api.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index e932765359c6..ed54f1702324 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -87,8 +87,13 @@ neutron_opts = [ 'neutron client requests.'), cfg.BoolOpt('allow_duplicate_networks', default=False, - help='Allow an instance to have multiple vNICs attached to ' - 'the same Neutron network.'), + help='DEPRECATED: Allow an instance to have multiple vNICs ' + 'attached to the same Neutron network. This option is ' + 'deprecated in the 2015.1 release and will be removed ' + 'in the 2015.2 release where the default behavior will ' + 'be to always allow multiple ports from the same network ' + 'to be attached to an instance.', + deprecated_for_removal=True), ] CONF = cfg.CONF