diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-22 06:22:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-22 06:22:39 +0000 |
| commit | cefb0510b8f12dab17126907661d82094c31741d (patch) | |
| tree | d65ab4d19e739b46d165fd0df799be320e547eab /nova/virt | |
| parent | 76750f3dcce19098c9fb9793db1fe0c40411f7af (diff) | |
| parent | 967e9675874fc2a02a585cc6f9b99175f9cd656c (diff) | |
| download | nova-cefb0510b8f12dab17126907661d82094c31741d.tar.gz nova-cefb0510b8f12dab17126907661d82094c31741d.tar.xz nova-cefb0510b8f12dab17126907661d82094c31741d.zip | |
Merge "Fix sys_meta access in prep for instance object"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/agent.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index 05a0fae41..0bd6d776e 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -197,7 +197,7 @@ class XenAPIBasedAgent(object): if sshkey: ctxt = context.get_admin_context() enc = crypto.ssh_encrypt_text(sshkey, new_pass) - sys_meta = utils.metadata_to_dict(self.instance['system_metadata']) + sys_meta = utils.instance_sys_meta(self.instance) sys_meta.update(password.convert_password(ctxt, base64.b64encode(enc))) self.virtapi.instance_update(ctxt, self.instance['uuid'], diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index ff6f7f266..ac8c9c58b 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -1017,7 +1017,7 @@ def _create_image(context, session, instance, name_label, image_id, elif cache_images == 'all': cache = True elif cache_images == 'some': - sys_meta = utils.metadata_to_dict(instance['system_metadata']) + sys_meta = utils.instance_sys_meta(instance) try: cache = strutils.bool_from_string(sys_meta['image_cache_in_nova']) except KeyError: @@ -1112,7 +1112,7 @@ def _image_uses_bittorrent(context, instance): if xenapi_torrent_images == 'all': bittorrent = True elif xenapi_torrent_images == 'some': - sys_meta = utils.metadata_to_dict(instance['system_metadata']) + sys_meta = utils.instance_sys_meta(instance) try: bittorrent = strutils.bool_from_string( sys_meta['image_bittorrent']) |