diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-04-05 15:17:37 -0400 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-04-05 15:17:37 -0400 |
| commit | 29b7a087efc64965e079733fe62e552fac70d13a (patch) | |
| tree | f96d97dc7b2b715f9bf83d11c0101ae2cdcce8f4 | |
| parent | dc887ab39641039817cdddce062bd398e69d07e5 (diff) | |
| download | nova-29b7a087efc64965e079733fe62e552fac70d13a.tar.gz nova-29b7a087efc64965e079733fe62e552fac70d13a.tar.xz nova-29b7a087efc64965e079733fe62e552fac70d13a.zip | |
Fix a giant batch of copypasta.
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b0c301925..916c1db5e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -195,6 +195,7 @@ class ComputeManager(manager.SchedulerDependentManager): """This call passes straight through to the virtualization driver.""" return self.driver.refresh_provider_fw_rules() + @exception.wrap_exception def run_instance(self, context, instance_id, **kwargs): """Launch a new instance with specified options.""" context = context.elevated() diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index f3d73103b..c5ada729a 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -1790,6 +1790,11 @@ class NWFilterFirewall(FirewallDriver): else: base_filter = 'nova-base' + ctxt = context.get_admin_context() + + instance_secgroup_filter_name = \ + '%s-secgroup' % (self._instance_filter_name(instance)) + instance_secgroup_filter_children = ['nova-base-ipv4', 'nova-base-ipv6', 'nova-allow-dhcp-server'] |