openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update urls for Delorean repo files"

Browse Source
This commit is contained in:
Jenkins 2016-06-24 11:29:18 +00:00 committed by Gerrit Code Review
commit 24404a1b5a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kolla/common/config.py
View File

@ -26,9 +26,10 @@ DISTRO_RELEASE = {
'debian': '8', 'debian': '8',
'ubuntu': '14.04', 'ubuntu': '14.04',
} }
RDO_MIRROR = "http://trunk.rdoproject.org/centos7" DELOREAN = ("http://buildlogs.centos.org/centos/7/cloud/x86_64/"
DELOREAN = "{}/current-passed-ci/delorean.repo".format(RDO_MIRROR) "rdo-trunk-master-tested/delorean.repo")
DELOREAN_DEPS = "{}/delorean-deps.repo".format(RDO_MIRROR) # 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'] INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
_PROFILE_OPTS = [ _PROFILE_OPTS = [

4
kolla/image/build.py
View File

@ -561,8 +561,8 @@ class KollaWorker(object):
if config.startswith('http'): if config.startswith('http'):
# Curl http://url/etc.repo to /etc/yum.repos.d/etc.repo # Curl http://url/etc.repo to /etc/yum.repos.d/etc.repo
name = config.split('/')[-1] name = config.split('/')[-1]
cmd = "RUN curl {} -o /etc/yum.repos.d/{}".format(config, cmd = "RUN curl -L {} -o /etc/yum.repos.d/{}".format(
name) config, name)
else: else:
# Copy .repo file from filesystem # Copy .repo file from filesystem
cmd = "COPY {} /etc/yum.repos.d/".format(config) cmd = "COPY {} /etc/yum.repos.d/".format(config)