Actions
Bug #10286
closedinternal.lock_machines no longer respects command-line args --os-type/--os-version
Status:
Duplicate
Priority:
Normal
Assignee:
-
Category:
-
% Done:
0%
Source:
Development
Tags:
Backport:
Regression:
Severity:
3 - minor
Reviewed:
Affected Versions:
ceph-qa-suite:
Crash signature (v1):
Crash signature (v2):
Updated by Dan Mick over 9 years ago
- Source changed from other to Development
If --os-type and --os-version are set on the command line, they don't get noticed in internal.lock_machines. I am not sure I'm correctly inferring the new rules for what overrides what where, but this is a possible fix to the issue:
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -64,8 +64,8 @@ def lock_machines(ctx, config):
new machines. This is not called if the one has teuthology-locked
machines and placed those keys in the Targets section of a yaml file.
"""
- os_type = ctx.config.get('os_type')
- os_version = ctx.config.get('os_version')
+ os_type = ctx.config.get('os_type') or ctx.get('os_type')
+ os_version = ctx.config.get('os_version') or ctx.get('os_version')
arch = ctx.config.get('arch')
log.info('Locking machines...')
assert isinstance(config[0], int), 'config[0] must be an integer'
Actions