diff options
| author | Rick Harris <rconradharris@gmail.com> | 2013-05-09 22:39:20 +0000 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2013-05-14 17:24:35 +0000 |
| commit | 1b9489fb0d556a2661c299cf67ed3d26ffcb2dce (patch) | |
| tree | 3a1f33a31e591daea039fb23380959db5ad8c400 /nova/virt | |
| parent | da1d7390fea6ba8ac9eefd1a25e5c1412e624ee3 (diff) | |
Use Oslo's `bool_from_string`
Oslo provides an equivalent implmentation of `bool_from_str` so we
should switch the code to use that instead.
Change-Id: I382f23af2468e276ae4342dff18cf06e1c24b755
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 30cee234a..4cd2b2ab5 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -45,6 +45,7 @@ from nova.image import glance from nova.openstack.common import excutils from nova.openstack.common import log as logging from nova.openstack.common import processutils +from nova.openstack.common import strutils from nova import utils from nova.virt import configdrive from nova.virt.disk import api as disk @@ -998,7 +999,7 @@ def _create_image(context, session, instance, name_label, image_id, elif cache_images == 'some': sys_meta = utils.metadata_to_dict(instance['system_metadata']) try: - cache = utils.bool_from_str(sys_meta['image_cache_in_nova']) + cache = strutils.bool_from_string(sys_meta['image_cache_in_nova']) except KeyError: cache = False elif cache_images == 'none': @@ -1091,7 +1092,8 @@ def _image_uses_bittorrent(context, instance): elif xenapi_torrent_images == 'some': sys_meta = utils.metadata_to_dict(instance['system_metadata']) try: - bittorrent = utils.bool_from_str(sys_meta['image_bittorrent']) + bittorrent = strutils.bool_from_string( + sys_meta['image_bittorrent']) except KeyError: pass elif xenapi_torrent_images == 'none': |