From 3af14c34022eebcff424b950232858daaab272cc Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Fri, 24 Jun 2016 08:13:39 -0400
Subject: [PATCH] Update urls for Delorean repo files

delorean.repo is now redirected from trunk.rdoproject.org to
buildlogs.centos.org [0]

[0] https://www.redhat.com/archives/rdo-list/2016-June/msg00206.html

Closes-Bug: 1595568

Change-Id: I650abc34d9cf0c00f9025bd2c62f1bf03fbd96b7
---
 kolla/common/config.py | 7 ++++---
 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 ee10bcce02..3ca32fa266 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 74c05b69bf..9d3b388615 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)