summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-07-25 15:31:11 -0500
committerKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-07-25 15:31:34 -0500
commit82afe7ad5eac668aaefc79e16bbf2226eddde97d (patch)
tree2f6fbe30e9e5e1b1246c64027be1a4b0415cb6c7 /nova/db
parent9a40e9e9a4538f6ba87451137bf0d6d2598f2319 (diff)
downloadnova-82afe7ad5eac668aaefc79e16bbf2226eddde97d.tar.gz
nova-82afe7ad5eac668aaefc79e16bbf2226eddde97d.tar.xz
nova-82afe7ad5eac668aaefc79e16bbf2226eddde97d.zip
Inject instance metadata into xenstore
When using Xenserver, inject instance metadata into the xenstore, for the use of the instance. Implements blueprint xenstore-metadata. Change-Id: I88a59f1b783eaaaef6ba5efd8bd448aece2f869c
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/sqlalchemy/api.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7b258c42d..527c10a61 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1470,6 +1470,7 @@ def _build_instance_get(context, session=None):
options(joinedload_all('security_groups.rules')).\
options(joinedload('info_cache')).\
options(joinedload('metadata')).\
+ options(joinedload('system_metadata')).\
options(joinedload('instance_type'))