From: Zack Cerza <zack@redhat.com>
Date: Fri, 9 Jan 2015 16:29:06 +0000 (-0700)
Subject: Use teuthology.config for gitbuilder_host
X-Git-Tag: 1.1.0~1049^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F401%2Fhead;p=teuthology.git

Use teuthology.config for gitbuilder_host

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index e0511246d..d6de34bb0 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -7,6 +7,7 @@ import time
 import os
 import subprocess
 
+from teuthology.config import config as teuth_config
 from teuthology import misc as teuthology
 from teuthology import contextutil
 from teuthology.exceptions import VersionNotFoundError
@@ -254,8 +255,7 @@ def _get_baseurl(ctx, remote, config):
     # get distro name and arch
     baseparms = _get_baseurlinfo_and_dist(ctx, remote, config)
     base_url = 'http://{host}/{proj}-{pkg_type}-{dist}-{arch}-{flavor}/{uri}'.format(
-        host=ctx.teuthology_config.get('gitbuilder_host',
-                                       'gitbuilder.ceph.com'),
+        host=teuth_config.gitbuilder_host,
         proj=config.get('project', 'ceph'),
         pkg_type=remote.system_type,
         **baseparms
@@ -427,8 +427,7 @@ def _update_rpm_package_list_and_install(ctx, remote, rpm, config):
     baseparms = _get_baseurlinfo_and_dist(ctx, remote, config)
     log.info("Installing packages: {pkglist} on remote rpm {arch}".format(
         pkglist=", ".join(rpm), arch=baseparms['arch']))
-    host = ctx.teuthology_config.get('gitbuilder_host',
-                                     'gitbuilder.ceph.com')
+    host = teuth_config.gitbuilder_host
     dist_release = baseparms['dist_release']
     start_of_url = 'http://{host}/ceph-rpm-{distro_release}-{arch}-{flavor}/{uri}'.format(
         host=host, **baseparms)
@@ -860,8 +859,7 @@ def _upgrade_deb_packages(ctx, config, remote, debs):
     tag = config.get('tag')
     uri = _get_uri(tag, branch, sha1)
     base_url = 'http://{host}/{proj}-deb-{dist}-{arch}-{flavor}/{uri}'.format(
-        host=ctx.teuthology_config.get('gitbuilder_host',
-                                       'gitbuilder.ceph.com'),
+        host=teuth_config.gitbuilder_host,
         proj=config.get('project', 'ceph'),
         dist=dist,
         arch=arch,