From 218776b219be1d688a4f27488d6245dc09caa2a8 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@cerza.org>
Date: Tue, 24 Sep 2013 14:19:24 -0500
Subject: [PATCH] Fix namespace collision

---
 teuthology/task/ceph-deploy.py | 3 ++-
 teuthology/task/s3readwrite.py | 3 ++-
 teuthology/task/s3roundtrip.py | 2 +-
 teuthology/task/s3tests.py     | 3 ++-
 teuthology/task/swift.py       | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py
index ee95ccb400..1e6427162d 100644
--- 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 99795838d5..e9cc6ec13d 100644
--- 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 5b69119f74..f3b8a53302 100644
--- 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 73907b850f..e23d1553a2 100644
--- 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 38da17c339..501ca7c6fe 100644
--- 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),
                 ],
             )
-- 
2.39.5