diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-09-17 18:00:25 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-09-17 18:00:25 +0000 |
| commit | 7f80909f4818a5a8d9b61816a3ce23792cdba8a0 (patch) | |
| tree | 58ab299c7998aaa2536d80aa816f17e031e76743 /nova/virt | |
| parent | 830a85815cc6b53395a91efb93466692dc33fc83 (diff) | |
| parent | 2d3027da762cdac0c5a12adee15d1bb28fb7bf10 (diff) | |
Fix a bug that would make spawning new instances fail if no port/protocol is given (for rules granting access for other security groups).
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/firewall.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index 0db10c7ce..c6253511e 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: |