From 6d0e5ba7f63783e2a6eded094ab14090fc704aa1 Mon Sep 17 00:00:00 2001 From: ZhaoBo Date: Tue, 20 Jun 2017 16:31:09 +0800 Subject: [PATCH] Correct the config group in check_trunk_dependencies The 'securitygroup' is registered as cfg.CONF.SECURITYGROUP. Currently, this check always raise error as no 'cfg.CONF.securitygroup', then neutron will abort the trunk_create. So nova will error when create VM with trunk parent port for waiting timeout about the network-vif-plugged event. Closes-Bug: #1699516 Related-Bug: #1669074 Change-Id: I0b0bdb5a39f1978e12ddaeddd4e0d825894ea241 (cherry picked from commit 012de2ea0875609c60445a731ead0b522e8cdb22) --- neutron/services/trunk/drivers/openvswitch/agent/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron/services/trunk/drivers/openvswitch/agent/driver.py b/neutron/services/trunk/drivers/openvswitch/agent/driver.py index 0dcc859cc44..9bee64f52cf 100644 --- a/neutron/services/trunk/drivers/openvswitch/agent/driver.py +++ b/neutron/services/trunk/drivers/openvswitch/agent/driver.py @@ -86,7 +86,7 @@ class OVSTrunkSkeleton(agent.TrunkSkeleton): # we could check for incompatibilities and abort the creation request # only if the trunk is indeed associated with ports that have security # groups and QoS rules, though this would be a lot more work. - if "iptables_hybrid" in cfg.CONF.securitygroup.firewall_driver: + if "iptables_hybrid" in cfg.CONF.SECURITYGROUP.firewall_driver: LOG.warning(_LW( "Firewall driver iptables_hybrid is not compatible with " "trunk ports. Trunk %(trunk_id)s may be insecure."),