diff options
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 7 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index ee10bcce0..3ca32fa26 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -26,9 +26,10 @@ DISTRO_RELEASE = { 'debian': '8', 'ubuntu': '14.04', } -RDO_MIRROR = "http://trunk.rdoproject.org/centos7" -DELOREAN = "{}/current-passed-ci/delorean.repo".format(RDO_MIRROR) -DELOREAN_DEPS = "{}/delorean-deps.repo".format(RDO_MIRROR) +DELOREAN = ("http://buildlogs.centos.org/centos/7/cloud/x86_64/" + "rdo-trunk-master-tested/delorean.repo") +# TODO(pbourke): update to buildlogs.centos.org once this moves +DELOREAN_DEPS = "http://trunk.rdoproject.org/centos7/delorean-deps.repo" INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] _PROFILE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index 74c05b69b..9d3b38861 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -561,8 +561,8 @@ class KollaWorker(object): if config.startswith('http'): # Curl http://url/etc.repo to /etc/yum.repos.d/etc.repo name = config.split('/')[-1] - cmd = "RUN curl {} -o /etc/yum.repos.d/{}".format(config, - name) + cmd = "RUN curl -L {} -o /etc/yum.repos.d/{}".format( + config, name) else: # Copy .repo file from filesystem cmd = "COPY {} /etc/yum.repos.d/".format(config) |