Fix namespace collision

diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py
index ee95ccb400ed816b82ea29346ae7d885c6cbad14..1e6427162debb2f176214122a51bb36e13b7b68b 100644 (file)
--- a/teuthology/task/ceph-deploy.py
+++ b/teuthology/task/ceph-deploy.py
@@ -7,6 +7,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
 from ..orchestra import run
 
@@ -31,7 +32,7 @@ def download_ceph_deploy(ctx, config):
     ctx.cluster.only(ceph_admin).run(
         args=[
             'git', 'clone', '-b', ceph_deploy_branch,
-            config.ceph_git_base_url + 'ceph-deploy.git',
+            teuth_config.ceph_git_base_url + 'ceph-deploy.git',
             '{tdir}/ceph-deploy'.format(tdir=testdir),
             ],
         )

diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py
index 99795838d5993848581b35103504ffbff654e0ae..e9cc6ec13da2280f886468e82e627c4e13e80964 100644 (file)
--- a/teuthology/task/s3readwrite.py
+++ b/teuthology/task/s3readwrite.py
@@ -9,6 +9,7 @@ import yaml
 
 from teuthology import misc as teuthology
 from teuthology import contextutil
+from ..config import config as teuth_config
 from ..orchestra import run
 from ..orchestra.connection import split_user
 
@@ -29,7 +30,7 @@ def download(ctx, config):
             args=[
                 'git', 'clone',
                 '-b', branch,
-                config.ceph_git_base_url + 's3-tests.git',
+                teuth_config.ceph_git_base_url + 's3-tests.git',
                 '{tdir}/s3-tests'.format(tdir=testdir),
                 ],
             )

diff --git a/teuthology/task/s3roundtrip.py b/teuthology/task/s3roundtrip.py
index 5b69119f74a2bb0c733cdba167ed95760a60898b..f3b8a533028115fd31509e1e9979dd31c3fb1399 100644 (file)
--- a/teuthology/task/s3roundtrip.py
+++ b/teuthology/task/s3roundtrip.py
@@ -25,7 +25,7 @@ def download(ctx, config):
         ctx.cluster.only(client).run(
             args=[
                 'git', 'clone',
-                config.ceph_git_base_url + 's3-tests.git',
+                teuth_config.ceph_git_base_url + 's3-tests.git',
                 '{tdir}/s3-tests'.format(tdir=testdir),
                 ],
             )

diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py
index 73907b850f7dc0c3ddb93ae891d8beeeb0b68c29..e23d1553a2f8f6c534cd9716cb3fda5250ff112f 100644 (file)
--- a/teuthology/task/s3tests.py
+++ b/teuthology/task/s3tests.py
@@ -11,6 +11,7 @@ import teuthology.task_util.rgw as rgw_utils
 
 from teuthology import misc as teuthology
 from teuthology import contextutil
+from ..config import config as teuth_config
 from ..orchestra import run
 from ..orchestra.connection import split_user
 
@@ -111,7 +112,7 @@ def download(ctx, config):
             args=[
                 'git', 'clone',
                 '-b', branch,
-                config.ceph_git_base_url + 's3-tests.git',
+                teuth_config.ceph_git_base_url + 's3-tests.git',
                 '{tdir}/s3-tests'.format(tdir=testdir),
                 ],
             )

diff --git a/teuthology/task/swift.py b/teuthology/task/swift.py
index 38da17c33968bc5c850a237f4415486370702d92..501ca7c6feff2de9003611effa45ae232905e8c8 100644 (file)
--- a/teuthology/task/swift.py
+++ b/teuthology/task/swift.py
@@ -7,6 +7,7 @@ import os
 
 from teuthology import misc as teuthology
 from teuthology import contextutil
+from ..config import config as teuth_config
 from ..orchestra import run
 from ..orchestra.connection import split_user
 
@@ -22,7 +23,7 @@ def download(ctx, config):
         ctx.cluster.only(client).run(
             args=[
                 'git', 'clone',
-                config.ceph_git_base_url + 'swift.git',
+                teuth_config.ceph_git_base_url + 'swift.git',
                 '{tdir}/swift'.format(tdir=testdir),
                 ],
             )