From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Jul 2014 17:55:10 +0000 (-0700)
Subject: ceph_deploy: use new ship_utilities location
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd6e53a5bc118e43cc67c1f6f49327950a871745;p=teuthology.git

ceph_deploy: use new ship_utilities location

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 828bb2a6ea934b8788570ca3f9871a637dbd3c70)
---

diff --git a/teuthology/task/ceph_deploy.py b/teuthology/task/ceph_deploy.py
index aec9d1b2c..3a43adbd4 100644
--- a/teuthology/task/ceph_deploy.py
+++ b/teuthology/task/ceph_deploy.py
@@ -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', {}),