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 012de2ea08)
This commit is contained in:
ZhaoBo 2017-06-20 16:31:09 +08:00 committed by Jakub Libosvar
parent d114e0f105
commit 6d0e5ba7f6

View File

@ -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."),