diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-01-03 11:39:02 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-01-03 11:39:02 +0100 |
| commit | 2b26cbfd8dc5f03026dfb03eef9cd3a443edab86 (patch) | |
| tree | bcef63d7754e4226c151892920daef29aef95be7 | |
| parent | c6736ab21a789830d76588333242b63979abc65c (diff) | |
| download | nova-2b26cbfd8dc5f03026dfb03eef9cd3a443edab86.tar.gz nova-2b26cbfd8dc5f03026dfb03eef9cd3a443edab86.tar.xz nova-2b26cbfd8dc5f03026dfb03eef9cd3a443edab86.zip | |
Fix a merge artifact.
| -rw-r--r-- | nova/virt/libvirt_conn.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 30ac11bdd..492353793 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -927,18 +927,11 @@ class NWFilterFirewall(FirewallDriver): ctxt = context.get_admin_context() if FLAGS.allow_project_net_traffic: - network_ref = db.project_get_network(ctxt, instance['project_id']) - net, mask = _get_net_and_mask(network_ref['cidr']) - - project_filter = self.nova_project_filter(instance['project_id'], - net, mask) - self._define_filter(project_filter) - - instance_secgroup_filter_children += [('nova-project-%s' % - instance['project_id'])] + instance_filter_children += ['nova-project'] for security_group in db.security_group_get_by_instance(ctxt, instance['id']): + self.refresh_security_group_rules(security_group['id']) instance_secgroup_filter_children += [('nova-secgroup-%s' % |