RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-06 10:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #348 from ceph/wip-9871

Browse Source 
lock.py: update keys for any owned VMs, even if none mentioned on CLI
This commit is contained in:
Zack Cerza 2014-10-28 13:26:14 -06:00
commit e13c152536
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
teuthology/lock.py
View File

@ -161,18 +161,26 @@ def main(ctx):
else:
statuses = list_locks()
vmachines = []
my_vmachines = []
for vmachine in statuses:
if vmachine['vm_host']:
if vmachine['locked']:
vmachines.append(vmachine['name'])
for machine in statuses:
if machine['is_vm'] and machine['locked']:
vmachines.append(machine['name'])
# keep track of which are ours, so that if we don't
# specify machines, the update_keys below can only try
# ours
if machine['locked_by'] == user:
my_vmachines.append(machine['name'])
if vmachines:
# Avoid ssh-keyscans for everybody when listing all machines
# Listing specific machines will update the keys.
if machines:
do_update_keys(vmachines)
statuses = [get_status(machine)
for machine in machines]
# Listing specific machines will update the keys, and if none
# are specified, my_vmachines will also be updated (if any)
if machines or not ctx.all:
if my_vmachines:
do_update_keys(my_vmachines)
if machines:
statuses = [get_status(machine)
for machine in machines]
else:
statuses = list_locks()
if statuses: