Fix duplicate declaration of neutron_tunnel firewall rule

If we have more than one network node we have to ensure firewall
rules are generated with not only host but also destination ip in
name.

Change-Id: I6c990fe301731078ddfa42de9552a591336b6788
Resolves: rhbz#1174001
This commit is contained in:
Lukas Bezdicka
2014-12-16 17:55:18 +01:00
parent 657a48e59c
commit e07307b436

View File

@@ -593,9 +593,9 @@ def create_manifests(config, messages):
# We also need to open VXLAN/GRE port for agent
manifest_data = ""
if use_openvswitch_vxlan(config) or use_openvswitch_gre(config):
cf_fw_nt_key = ("FIREWALL_NEUTRON_TUNNEL_RULES_%s"
% host)
for n_host in network_hosts:
cf_fw_nt_key = ("FIREWALL_NEUTRON_TUNNEL_RULES_%s_%s"
% (host, n_host))
fw_details = dict()
key = "neutron_tunnel_%s_%s" % (host, n_host)
fw_details.setdefault(key, {})