summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-02-21 10:18:43 +0100
committerSoren Hansen <soren@linux2go.dk>2011-02-21 10:18:43 +0100
commitcbb0402efac4ededdda0ac2097ec087216e23931 (patch)
tree6cff3bd2c85375dbff5196e63987b3257c5a3009 /nova/virt
parente729c49543c5acf354b154a3e2d9fd76a2f7da35 (diff)
Also remove rules that jump to deleted chains.
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt_conn.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 3faf01f4b..daf8f0ed7 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -44,9 +44,6 @@ import uuid
from xml.dom import minidom
-from eventlet import greenthread
-from eventlet import event
-from eventlet import semaphore
from eventlet import tpool
import IPy
@@ -1246,7 +1243,7 @@ class IptablesFirewallDriver(FirewallDriver):
if FLAGS.use_ipv6:
self.iptables.ipv6['filter'].add_chain(chain_name)
ipv6_address = self._ip_for_instance_v6(instance)
- self.iptables.ipv4['filter'].add_rule('local',
+ self.iptables.ipv6['filter'].add_rule('local',
'-d %s -j $%s' %
(ipv6_address,
chain_name))
@@ -1376,7 +1373,7 @@ class IptablesFirewallDriver(FirewallDriver):
pass
def refresh_security_group_rules(self, security_group):
- for instance in self.instances:
+ for instance in self.instances.values():
self.remove_filters_for_instance(instance)
self.add_filters_for_instance(instance)
self.iptables.apply()