diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-01 19:49:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-01 19:49:44 +0000 |
| commit | 0d8772977eb7e09c7ad404f32937999470b359b9 (patch) | |
| tree | 5428d7ab1a256d3e1832215ce1590fc7b1022b15 /nova/api | |
| parent | 3d12cf5c1fbc8fd30d4a4aa30d1c7f6c16782b1b (diff) | |
| parent | 2da5ea6e5685ae5c349fc1d175594aecbe0a0e23 (diff) | |
Merge "Ensure only pickle-able objects live in metadata"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/metadata/base.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 90dcb9ca5..1f5e5b5b9 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -99,13 +99,12 @@ class InstanceMetadata(): self.extra_md = extra_md if conductor_api: - self.conductor_api = conductor_api + capi = conductor_api else: - self.conductor_api = conductor.API() + capi = conductor.API() ctxt = context.get_admin_context() - capi = self.conductor_api self.availability_zone = ec2utils.get_availability_zone_by_host( instance['host'], capi) |