diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-16 15:16:16 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-16 15:16:16 -0400 |
| commit | 19a2f8ce5174fa758de9031d64f1bed0f7c44788 (patch) | |
| tree | 7e0427cf065faf6829b1bcb6af444796bc2b8ce2 /nova/virt | |
| parent | fc07caece79e379b6d6f2a3220806af9271e349b (diff) | |
| parent | 7dbda7ca270ee5109f307be3d0f1fb7c0336ce21 (diff) | |
merge lp:nova and resolve conflicts
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 7994e9547..6e564d0cb 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -502,7 +502,7 @@ class LibvirtConnection(object): cmd = 'netcat', '0.0.0.0', port, '-w', '1' try: stdout, stderr = utils.execute(*cmd, process_input='') - except ProcessExecutionError: + except exception.ProcessExecutionError: return port raise Exception(_('Unable to find an open port')) @@ -1597,6 +1597,8 @@ class IptablesFirewallDriver(FirewallDriver): self.iptables.ipv4['filter'].add_chain('sg-fallback') self.iptables.ipv4['filter'].add_rule('sg-fallback', '-j DROP') + self.iptables.ipv6['filter'].add_chain('sg-fallback') + self.iptables.ipv6['filter'].add_rule('sg-fallback', '-j DROP') def setup_basic_filtering(self, instance): """Use NWFilter from libvirt for this.""" |