From 8afba4abff8efd475b5d25965c18804718e2468a Mon Sep 17 00:00:00 2001 From: Florian Fuchs Date: Thu, 7 Jul 2016 15:37:08 +0200 Subject: [PATCH] Use centos.org URLs instead of redirecting Some of the repo files are now available on their new centos.org home rather than rdoproject.org. This causes problems with some curl calls, since it doesn't follow redirects by default. In this patch those URLs which are currently redirected to centos.org are replaced with the new URLs. Also, in places where curl calls are executed by the user, the -L option is added to the curl call. Change-Id: I18b46b0d2cf95b16e5dcb2a090433f6a5bd36cde --- doc/source/basic_deployment/basic_deployment_cli.rst | 2 +- doc/source/repositories.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst index 222a7f1c..4ed03585 100644 --- a/doc/source/basic_deployment/basic_deployment_cli.rst +++ b/doc/source/basic_deployment/basic_deployment_cli.rst @@ -84,7 +84,7 @@ non-root user that was used to install the undercloud. :: export USE_DELOREAN_TRUNK=1 - export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7/current-tripleo/" + export DELOREAN_TRUNK_REPO="http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/" export DELOREAN_REPO_FILE="delorean.repo" .. admonition:: Stable Branch diff --git a/doc/source/repositories.txt b/doc/source/repositories.txt index df710e3a..735f37d6 100644 --- a/doc/source/repositories.txt +++ b/doc/source/repositories.txt @@ -2,13 +2,13 @@ :: - sudo curl -o /etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7/current-tripleo/delorean.repo + sudo curl -L -o /etc/yum.repos.d/delorean.repo http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/delorean.repo Enable latest RDO Trunk Delorean repository only for the |project| packages :: - sudo curl -o /etc/yum.repos.d/delorean-current.repo http://trunk.rdoproject.org/centos7/current/delorean.repo + sudo curl -L -o /etc/yum.repos.d/delorean-current.repo http://trunk.rdoproject.org/centos7/current/delorean.repo sudo sed -i 's/\[delorean\]/\[delorean-current\]/' /etc/yum.repos.d/delorean-current.repo sudo /bin/bash -c "cat <>/etc/yum.repos.d/delorean-current.repo @@ -20,7 +20,7 @@ :: - sudo curl -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7/delorean-deps.repo + sudo curl -L -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7/delorean-deps.repo .. admonition:: Stable Branch :class: stable @@ -31,10 +31,10 @@ :: - sudo curl -o /etc/yum.repos.d/delorean-liberty.repo https://trunk.rdoproject.org/centos7-liberty/current/delorean.repo + sudo curl -L -o /etc/yum.repos.d/delorean-liberty.repo https://trunk.rdoproject.org/centos7-liberty/current/delorean.repo Enable the Delorean Deps repository :: - sudo curl -o /etc/yum.repos.d/delorean-deps-liberty.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo + sudo curl -L -o /etc/yum.repos.d/delorean-deps-liberty.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo