]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Fix leftover orchestra import clause.
authorTommi Virtanen <tommi.virtanen@dreamhost.com>
Mon, 7 Nov 2011 21:05:14 +0000 (13:05 -0800)
committerTommi Virtanen <tommi.virtanen@dreamhost.com>
Mon, 7 Nov 2011 21:05:14 +0000 (13:05 -0800)
This seems to be a leftover from
a2372fce12b6bd1818e155d1d8ed5134dbd8fd4a,
no idea how it stayed hidden this long.

teuthology/task/internal.py

index a7df647503cab6a6e0499cdaca36584b6ebbb751..0cb9810fa6920f5c913af592f6a7a0fd5c28a01c 100644 (file)
@@ -114,7 +114,7 @@ def check_lock(ctx, config):
 def connect(ctx, config):
     log.info('Opening connections...')
     from ..orchestra import connection, remote
-    import orchestra.cluster
+    from ..orchestra import cluster
     remotes = []
     for t, key in ctx.config['targets'].iteritems():
         log.debug('connecting to %s', t)
@@ -123,7 +123,7 @@ def connect(ctx, config):
                           ssh=connection.connect(user_at_host=t,
                                                  host_key=key,
                                                  keep_alive=True)))
-    ctx.cluster = orchestra.cluster.Cluster()
+    ctx.cluster = cluster.Cluster()
     if 'roles' in ctx.config:
         for rem, roles in zip(remotes, ctx.config['roles']):
             assert all(isinstance(role, str) for role in roles), \