Merge "Update run_tests.sh to the latest revision"
diff --git a/_modules/runtest/tempest_sections/compute.py b/_modules/runtest/tempest_sections/compute.py
index d4b468e..6ae4439 100644
--- a/_modules/runtest/tempest_sections/compute.py
+++ b/_modules/runtest/tempest_sections/compute.py
@@ -185,4 +185,9 @@
@property
def volume_device_name(self):
- pass
+ c = conditions.BaseRule('nova.compute.enabled', 'eq', True)
+ force = self.get_item_when_condition_match('nova.compute.config_drive.forced', c)
+ # NOTE(mshalamov): implicit default in nova-compute.conf template in nova salt formula
+ # for nova.compute.config_drive.forced is 'true'
+ if force is None or force is True:
+ return 'vdc'