openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Switch trunk/cbs/buildlogs to use https

Browse Source 
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: I793e70f4239b8b7b2931de66a5013167133811af
This commit is contained in:
Emilien Macchi 2017-03-21 08:17:41 -04:00
parent b1a0198f64
commit 056a9b02a1
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/overcloud-upgrade/README.md
View File

@ -109,8 +109,8 @@ repos:
yum_repo_path: /etc/yum.repos.d/ yum_repo_path: /etc/yum.repos.d/
# Url of the delorean repos: # Url of the delorean repos:
repos_url: repos_url:
- http://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/{{ delorean_hash | default('current-passed-ci')}}/delorean.repo - https://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/{{ delorean_hash | default('current-passed-ci')}}/delorean.repo
- http://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo - https://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo
``` ```
Dependencies Dependencies

4
roles/overcloud-upgrade/defaults/main.yml
View File

@ -18,8 +18,8 @@ repos:
yum_repo_path: /etc/yum.repos.d/ yum_repo_path: /etc/yum.repos.d/
# Url of the delorean repos: # Url of the delorean repos:
repos_url: repos_url:
- http://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/{{ upgrade_delorean_hash | default('current-passed-ci')}}/delorean.repo - https://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/{{ upgrade_delorean_hash | default('current-passed-ci')}}/delorean.repo
- http://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo - https://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo
# upgrade settings: # upgrade settings:
upgrade_working_dir: "{{ working_dir }}" upgrade_working_dir: "{{ working_dir }}"
tht_dir: tripleo-heat-templates tht_dir: tripleo-heat-templates

4
roles/overcloud-upgrade/doc/upgrade.rst
View File

@ -74,8 +74,8 @@ The delorean_hash is the pinned version of the delorean repo.
yum_repo_path: /etc/yum.repos.d/ yum_repo_path: /etc/yum.repos.d/
# Url of the delorean repos: # Url of the delorean repos:
repos_url: repos_url:
- http://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/{{ upgrade_delorean_hash | default('current-passed-ci')}}/delorean.repo - https://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/{{ upgrade_delorean_hash | default('current-passed-ci')}}/delorean.repo
- http://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo - https://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo
.. Note:: If you don't use the delorean repo, you don't have to take care of .. Note:: If you don't use the delorean repo, you don't have to take care of
this values. If you override the upgrade_undercloud_repo_script and upgrade_overcloud_repo_script this values. If you override the upgrade_undercloud_repo_script and upgrade_overcloud_repo_script

6
roles/overcloud-upgrade/templates/overcloud-repo.yaml.j2
View File

@ -4,11 +4,11 @@ parameter_defaults:
pushd /etc/yum.repos.d/ pushd /etc/yum.repos.d/
rm -rf delorean* rm -rf delorean*
{% if upgrade_delorean_hash == 'current-passed-ci' %} {% if upgrade_delorean_hash == 'current-passed-ci' %}
curl -o -L http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-{{ target_upgrade_version }}-tested/delorean.repo curl -o -L https://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-{{ target_upgrade_version }}-tested/delorean.repo
{% else %} {% else %}
curl -o -L http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-{{ target_upgrade_version }}/delorean.repo curl -o -L https://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-{{ target_upgrade_version }}/delorean.repo
{% endif %} {% endif %}
curl -o -L http://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo curl -o -L https://trunk.rdoproject.org/centos7-{{ target_upgrade_version }}/delorean-deps.repo
popd popd
yum clean all yum clean all
{% if target_upgrade_version in ['ocata', 'master'] %} {% if target_upgrade_version in ['ocata', 'master'] %}

10
roles/repo-setup/README.md
View File

@ -88,8 +88,8 @@ Settings example for repositories:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo filename: delorean.repo
baseurl: http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/ baseurl: https://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/
hash_url: http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/delorean.repo hash_url: https://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/delorean.repo
priority: 20 priority: 20
releases: releases:
- master - master
@ -98,8 +98,8 @@ Settings example for repositories:
- type: generic - type: generic
reponame: delorean-current reponame: delorean-current
filename: delorean-current.repo filename: delorean-current.repo
baseurl: http://trunk.rdoproject.org/centos7/current baseurl: https://trunk.rdoproject.org/centos7/current
hash_url: http://trunk.rdoproject.org/centos7/current/delorean.repo hash_url: https://trunk.rdoproject.org/centos7/current/delorean.repo
priority: 10 priority: 10
includepkgs: includepkgs:
- diskimage-builder - diskimage-builder
@ -125,7 +125,7 @@ Settings example for repositories:
# In case of all releases # In case of all releases
- type: file - type: file
filename: delorean-deps.repo filename: delorean-deps.repo
down_url: http://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo down_url: https://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo
priority: 30 priority: 30
- type: package - type: package

2
roles/repo-setup/defaults/main.yml
View File

@ -26,4 +26,4 @@ repos:
- type: file - type: file
filename: delorean-deps.repo filename: delorean-deps.repo
down_url: http://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo down_url: https://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo