From 7a474b10b158ce914a36c4b15aa5cf7f3db390a7 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Tue, 31 May 2011 15:01:41 -0700 Subject: [PATCH] Use orchesta.remote as a higher-level wrapper, stop worrying about hostnames. This changes just first caller in a series of many; the rest will change once a role-based API is in place. --- dbench.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dbench.py b/dbench.py index 6dca434c53..f41de98386 100644 --- a/dbench.py +++ b/dbench.py @@ -10,7 +10,7 @@ import urllib2 import sys import yaml -from orchestra import connection, run +from orchestra import connection, run, remote # TODO cleanup import teuthology.misc as teuthology @@ -28,19 +28,19 @@ if __name__ == '__main__': ROLES = config['roles'] connections = [connection.connect(t) for t in config['targets']] + remotes = [remote.Remote(name=t, ssh=c) for c,t in zip(connections, config['targets'])] log.info('Checking for old test directory...') has_junk = False - for target, conn in zip(config['targets'], connections): + for rem in remotes: try: - run.run( - client=conn, + rem.run( args=[ 'test', '!', '-e', '/tmp/cephtest', ], ) except run.CommandFailedError as e: - log.error('Host %s has stale cephtest directory, check your lock and reboot to clean up.', target) + log.error('Host %s has stale cephtest directory, check your lock and reboot to clean up.', rem) has_junk = True if has_junk: sys.exit(1) -- 2.39.5