summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorIlya Alekseyev <ialekseev@griddynamics.com>2011-01-26 00:56:33 +0300
committerIlya Alekseyev <ialekseev@griddynamics.com>2011-01-26 00:56:33 +0300
commitc32ec232facf17dfc34d7598411f9195b484e44e (patch)
treee31b3770fba9e759830bf2eb602dbf397182e145 /nova/virt
parente811667b1e08bdfd7647cc29f792441db2cfb752 (diff)
parent705cbaa3d311c21cf2a7318e52a60eeadebb435a (diff)
downloadnova-c32ec232facf17dfc34d7598411f9195b484e44e.tar.gz
nova-c32ec232facf17dfc34d7598411f9195b484e44e.tar.xz
nova-c32ec232facf17dfc34d7598411f9195b484e44e.zip
Trunk merged
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt_conn.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index cb8528e96..ee4b6f563 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -1268,8 +1268,8 @@ class IptablesFirewallDriver(FirewallDriver):
if(ip_version == 4):
# Allow DHCP responses
dhcp_server = self._dhcp_server_for_instance(instance)
- our_rules += ['-A %s -s %s -p udp --sport 67 --dport 68' %
- (chain_name, dhcp_server)]
+ our_rules += ['-A %s -s %s -p udp --sport 67 --dport 68 '
+ '-j ACCEPT ' % (chain_name, dhcp_server)]
#Allow project network traffic
if (FLAGS.allow_project_net_traffic):
cidr = self._project_cidr_for_instance(instance)
@@ -1277,8 +1277,8 @@ class IptablesFirewallDriver(FirewallDriver):
elif(ip_version == 6):
# Allow RA responses
ra_server = self._ra_server_for_instance(instance)
- our_rules += ['-A %s -s %s -p icmpv6' %
- (chain_name, ra_server)]
+ our_rules += ['-A %s -s %s -p icmpv6 '
+ '-j ACCEPT' % (chain_name, ra_server)]
#Allow project network traffic
if (FLAGS.allow_project_net_traffic):
cidrv6 = self._project_cidrv6_for_instance(instance)