diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-05-10 15:34:00 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-05-22 17:03:06 -0700 |
| commit | 96164cecc6b7bf447d06896f723dab416e63ee06 (patch) | |
| tree | 7431eec5c982513e741e2a2ba7025fe398a1ddab /nova/compute | |
| parent | 986fa041a7cb8b85f4b3be47407288c1f71c0972 (diff) | |
Make a few places tolerant of sys_meta being a dict
This will be necessary as we start to introduce objects with
real dicts in system_metadata. These are the common spots that
need to be ready ahead of time. The rest are at the actual use
sites and can/will be replaced when individual uses are
converted to objects.
Related to bp/unified-internal-objects
Change-Id: I8314e0d52ec2ae800765f60ce58ce9b309d7d513
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/flavors.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py index 58dcd3fa5..7177f26bd 100644 --- a/nova/compute/flavors.py +++ b/nova/compute/flavors.py @@ -238,7 +238,7 @@ def extract_instance_type(instance, prefix=''): information.""" instance_type = {} - sys_meta = utils.metadata_to_dict(instance['system_metadata']) + sys_meta = utils.instance_sys_meta(instance) for key, type_fn in system_metadata_instance_type_props.items(): type_key = '%sinstance_type_%s' % (prefix, key) instance_type[key] = type_fn(sys_meta[type_key]) |