summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-09-02 13:44:10 +0200
committerSoren Hansen <soren@linux2go.dk>2011-09-02 13:44:10 +0200
commit8a5611f9b2fa632ccfcd04523ee42f69b223ea6e (patch)
tree255a889061c94a8ca8007d2ae390d542927ed1a0 /nova/virt
parentd80dc5bbbd1781bd33d9f69b608014e9cc2e41a3 (diff)
Fix protocol-less security groups.
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt/firewall.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index c2f4f91e8..dfa1deba7 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -663,7 +663,9 @@ class IptablesFirewallDriver(FirewallDriver):
if version == 6 and rule.protocol == 'icmp':
protocol = 'icmpv6'
- args = ['-j ACCEPT', '-p', protocol]
+ args = ['-j ACCEPT']
+ if protocol:
+ args += ['-p', protocol]
if protocol in ['udp', 'tcp']:
if rule.from_port == rule.to_port: