summaryrefslogtreecommitdiffstats
path: root/nova/api/metadata/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api/metadata/base.py')
-rw-r--r--nova/api/metadata/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 425e5bf53..da0a50662 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -32,6 +32,8 @@ from nova.compute import flavors
from nova import conductor
from nova import context
from nova import network
+from nova import utils
+
from nova.openstack.common import timeutils
from nova.virt import netutils
@@ -127,9 +129,7 @@ class InstanceMetadata():
self.address = address
# expose instance metadata.
- self.launch_metadata = {}
- for item in instance.get('metadata', []):
- self.launch_metadata[item['key']] = item['value']
+ self.launch_metadata = utils.instance_meta(instance)
self.password = password.extract_password(instance)