From 53c12143e9b0529898a15e4839b652858378e0bf Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Sat, 7 Nov 2015 22:55:20 -0800 Subject: [PATCH] Config drive: make use of an instance object Use an instance object instead of a dictionary. TrivialFix Change-Id: I520a5f0607b0aad53db093a9ab5511520c06ac4c --- nova/tests/unit/virt/xenapi/test_xenapi.py | 2 +- nova/virt/configdrive.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/tests/unit/virt/xenapi/test_xenapi.py b/nova/tests/unit/virt/xenapi/test_xenapi.py index 28b50ac5ea50..936356206e34 100644 --- a/nova/tests/unit/virt/xenapi/test_xenapi.py +++ b/nova/tests/unit/virt/xenapi/test_xenapi.py @@ -453,7 +453,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): 'write_requests': 0}], 'memory_details': {'maximum': 8192, 'used': 0}} - instance = self._create_instance() + instance = self._create_instance(obj=True) actual = self.conn.get_instance_diagnostics(instance) self.assertEqual(expected, actual.serialize()) diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index ed32b087ed0d..e7354212619b 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -185,7 +185,7 @@ def required_by(instance): "img_config_drive", fields.ConfigDrivePolicy.OPTIONAL) - return (instance.get('config_drive') or + return (instance.config_drive or 'always' == CONF.force_config_drive or strutils.bool_from_string(CONF.force_config_drive) or image_prop == fields.ConfigDrivePolicy.MANDATORY