]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
ceph_deploy: use new ship_utilities location 293/head
authorSage Weil <sage@redhat.com>
Tue, 22 Jul 2014 17:55:10 +0000 (10:55 -0700)
committerSage Weil <sage@redhat.com>
Tue, 22 Jul 2014 17:55:10 +0000 (10:55 -0700)
Signed-off-by: Sage Weil <sage@redhat.com>
teuthology/task/ceph_deploy.py

index aec9d1b2c4327abbadfba9adcdc8ef3c4e0c33f7..3a43adbd48280b63b0dd0df5d15c1d174b35bbc3 100644 (file)
@@ -11,7 +11,7 @@ import logging
 from teuthology import misc as teuthology
 from teuthology import contextutil
 from ..config import config as teuth_config
-import ceph as ceph_fn
+import install as install_fn
 from ..orchestra import run
 
 log = logging.getLogger(__name__)
@@ -455,7 +455,7 @@ def task(ctx, config):
         assert isinstance(config['branch'], dict), 'branch must be a dictionary'
 
     with contextutil.nested(
-         lambda: ceph_fn.ship_utilities(ctx=ctx, config=None),
+         lambda: install_fn.ship_utilities(ctx=ctx, config=None),
          lambda: download_ceph_deploy(ctx=ctx, config=config),
          lambda: build_ceph_cluster(ctx=ctx, config=dict(
                  conf=config.get('conf', {}),