summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-19 00:03:44 +0000
committerGerrit Code Review <review@openstack.org>2014-09-19 00:03:44 +0000
commit1def743412a3a697243b757c0ce6d5786a9b3229 (patch)
tree72d5a38d7fb427962d7c1597f26787c43b9493f1
parent34ad5983a27e65b4637e5863b35d8509c7d1b591 (diff)
parent3dc8676ab6f216af5d22ac1df1a4b34bccb1c27e (diff)
downloadnova-1def743412a3a697243b757c0ce6d5786a9b3229.tar.gz
Merge "Always filter out multicast from reflection" into stable/havana
-rw-r--r--nova/virt/libvirt/firewall.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index 1cbba788a8..acfc706c38 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -219,9 +219,8 @@ class NWFilterFirewall(base_firewall.FirewallDriver):
filter_set = ['no-mac-spoofing',
'no-ip-spoofing',
'no-arp-spoofing']
- if CONF.use_ipv6:
- self._define_filter(self.nova_no_nd_reflection_filter)
- filter_set.append('nova-no-nd-reflection')
+ self._define_filter(self.nova_no_nd_reflection_filter)
+ filter_set.append('nova-no-nd-reflection')
self._define_filter(self._filter_container('nova-nodhcp', filter_set))
filter_set.append('allow-dhcp-server')
self._define_filter(self._filter_container('nova-base', filter_set))