From 78638beacf12b541057fc39b74c398f0b9496f35 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 1 Dec 2015 11:44:25 -0700 Subject: [PATCH] nuke: Linter fixes Signed-off-by: Zack Cerza --- teuthology/nuke.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index 5b500baa28..3adf50c866 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -33,6 +33,7 @@ from .task.internal import check_lock, add_remotes, connect log = logging.getLogger(__name__) + def clear_firewall(ctx): """ Remove any iptables rules created by teuthology. These rules are @@ -367,6 +368,7 @@ def synch_clocks(remotes): log.info('Waiting for clock to synchronize on %s...', name) proc.wait() + def stale_openstack(ctx): targets = dict(map(lambda i: (i['Name'], i), OpenStack.list_instances())) @@ -383,13 +385,14 @@ def stale_openstack(ctx): # OPENSTACK_DELAY = 30 * 60 + def stale_openstack_instances(ctx, instances, locked_nodes): for (name, instance) in instances.iteritems(): i = OpenStackInstance(name) if (i.get_created() > - ctx.teuthology_config['max_job_time'] + OPENSTACK_DELAY): + ctx.teuthology_config['max_job_time'] + OPENSTACK_DELAY): log.info( - "stale-openstack: destroying instance {instance}" + "stale-openstack: destroying instance {instance}" " because it was created {created} seconds ago" " which is older than" " max_job_time {max_job_time} + {delay}" @@ -402,7 +405,7 @@ def stale_openstack_instances(ctx, instances, locked_nodes): continue name = canonicalize_hostname(i['name'], user=None) if i.get_created() > OPENSTACK_DELAY and name not in locked_nodes: - log.info("stale-openstack: destroying instance {instance}" + log.info("stale-openstack: destroying instance {instance}" " because it was created {created} seconds ago" " is older than {delay}s and it is not locked" .format(instance=i['name'], @@ -413,9 +416,11 @@ def stale_openstack_instances(ctx, instances, locked_nodes): continue log.debug("stale-openstack: instance " + i['name'] + " OK") + def openstack_delete_volume(id): sh("openstack volume delete " + id + " || true") + def stale_openstack_volumes(ctx, volumes): now = datetime.datetime.now() for volume in volumes: @@ -441,14 +446,15 @@ def stale_openstack_volumes(ctx, volumes): continue log.debug("stale-openstack: volume " + volume['id'] + " OK") + def stale_openstack_nodes(ctx, instances, locked_nodes): for (name, node) in locked_nodes.iteritems(): name = decanonicalize_hostname(name) if node['machine_type'] != 'openstack': continue if (name not in instances and - locked_since_seconds(node) > OPENSTACK_DELAY): - log.info("stale-openstack: unlocking node {name} unlocked" + locked_since_seconds(node) > OPENSTACK_DELAY): + log.info("stale-openstack: unlocking node {name} unlocked" " because it was created {created}" " seconds ago which is older than {delay}" " and it has no instance" @@ -460,6 +466,7 @@ def stale_openstack_nodes(ctx, instances, locked_nodes): continue log.debug("stale-openstack: node " + name + " OK") + def openstack_remove_again(): """ Volumes and servers with REMOVE-ME in the name are leftover @@ -477,6 +484,7 @@ def openstack_remove_again(): true """) + def main(args): ctx = FakeNamespace(args) if ctx.verbose: -- 2.39.5