From 0537a7f9ca5e045cca1b6e083674705fab523bd9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 21 Mar 2017 08:21:04 -0400 Subject: Switch trunk/cbs/buildlogs to use https There is a permanent redirection from http to https in buildlogs, cbs and trunk repos that might create issues when the redirection fails for some reasons. Let's use https directly. Change-Id: I15b2df335b4b9331466da2f7cb6e838823a6fd34 --- doc/image-building.rst | 2 +- docker/base/Dockerfile.j2 | 2 +- kolla/common/config.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/image-building.rst b/doc/image-building.rst index 9bbc883b9..3b8ae1d71 100644 --- a/doc/image-building.rst +++ b/doc/image-building.rst @@ -382,7 +382,7 @@ form of ``.repo``, ``.rpm``, or a url. See examples below. Update ``rpm_setup_config`` in ``/etc/kolla/kolla-build.conf``:: - rpm_setup_config = http://trunk.rdoproject.org/centos7/currrent/delorean.repo,http://trunk.rdoproject.org/centos7/delorean-deps.repo + rpm_setup_config = https://trunk.rdoproject.org/centos7/currrent/delorean.repo,https://trunk.rdoproject.org/centos7/delorean-deps.repo If specifying a ``.repo`` file, each ``.repo`` file will need to exist in the same directory as the base Dockerfile (``kolla/docker/base``):: diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index cc1a7848f..eb233a117 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -145,7 +145,7 @@ RUN yum -y install \ yum-utils \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ && rpm -Uvh --nodeps \ - http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \ + https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-jewel-1.0-1.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-1.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \ diff --git a/kolla/common/config.py b/kolla/common/config.py index 4daa941bd..643670ccd 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -26,10 +26,10 @@ DISTRO_RELEASE = { 'debian': '8', 'ubuntu': '16.04', } -DELOREAN = ("http://buildlogs.centos.org/centos/7/cloud/x86_64/" +DELOREAN = ("https://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" +DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo" INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] TARBALLS_BASE = "http://tarballs.openstack.org" -- cgit v1.2.3