diff options
| author | Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> | 2011-01-26 19:44:13 +0900 |
|---|---|---|
| committer | Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> | 2011-01-26 19:44:13 +0900 |
| commit | 2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146 (patch) | |
| tree | cb3384b393d5c87df86e68f8fe6eb535ca673b60 | |
| parent | d139d81d3facb440f5f9b040d05e5b380ebf2c68 (diff) | |
| download | nova-2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146.tar.gz nova-2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146.tar.xz nova-2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146.zip | |
Fix merge miss
| -rw-r--r-- | nova/virt/libvirt_conn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 0a0bbfb59..3562fbd6b 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -1310,8 +1310,8 @@ class IptablesFirewallDriver(FirewallDriver): # Allow RA responses ra_server = self._ra_server_for_instance(instance) if ra_server: - our_rules += ['-A %s -s %s -p icmpv6' % - (chain_name, ra_server + "/128")] + our_rules += ['-A %s -s %s -p icmpv6 -j ACCEPT' % + (chain_name, ra_server + "/128")] #Allow project network traffic if (FLAGS.allow_project_net_traffic): cidrv6 = self._project_cidrv6_for_instance(instance) |