summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-23 03:40:37 +0000
committerGerrit Code Review <review@openstack.org>2012-08-23 03:40:37 +0000
commitf06c94bbfa2d01d7ca351c2693e1c90290952155 (patch)
tree5ac73bc5c7231929dc23875c1e119affc969a930
parent7b8f3b32b3f7e9e71a000eaf6f68cb9ffc2240d0 (diff)
parent30e6879d8139e13fc70b0d1c8ef13d7ee03ca5c3 (diff)
downloadnova-f06c94bbfa2d01d7ca351c2693e1c90290952155.tar.gz
nova-f06c94bbfa2d01d7ca351c2693e1c90290952155.tar.xz
nova-f06c94bbfa2d01d7ca351c2693e1c90290952155.zip
Merge "add availability_zone to openstack metadata"
-rw-r--r--nova/api/metadata/base.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index d9710dc37..24bdb592f 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -294,6 +294,7 @@ class InstanceMetadata():
FLAGS.dhcp_domain)
metadata['name'] = self.instance['display_name']
+ metadata['availability_zone'] = self.availability_zone
data = {
MD_JSON_NAME: json.dumps(metadata),