openstack
/
kolla
Code Issues Proposed changes

base/centos: stop treating AArch64 in special way 

All repositories we depend on got synced to mirrors. So we no longer
need to fetch ceph-luminous or opstools from buildlogs.centos.org
server.

Change-Id: Ie7b54d20f98d26d3e086bbbfcda289c2677a008a
(cherry-pick from c7b2bbf550)
This commit is contained in:
Marcin Juszkiewicz 2018-08-10 11:47:13 +02:00 committed by Pedro Alvarez
parent f61e7bf102
commit 9c194b3a62
2 changed files with 7 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
docker/base/Dockerfile.j2
View File

@ -63,12 +63,7 @@ RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
{% set base_yum_repo_keys = [
] %}
{% if base_arch == 'aarch64' %}
{% set base_yum_repo_files = [
'aarch64-cbs.repo'
] %}
{% elif base_arch == 'x86_64' %}
{% if base_arch == 'x86_64' %}
{% set base_yum_repo_files = [
'elasticsearch.repo',
'grafana.repo',
@ -127,38 +122,21 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
{% endblock %}
{% set base_centos_yum_repo_keys = [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
] %}
{% set base_centos_yum_repo_packages = [
'centos-release-ceph-luminous',
'centos-release-openstack-queens',
'centos-release-opstools',
'centos-release-qemu-ev',
'epel-release',
'yum-plugin-priorities'
] %}
{% if base_arch == 'x86_64' %}
{% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage'
] %}
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
'centos-release-ceph-luminous',
'centos-release-openstack-queens',
'centos-release-opstools'
] %}
{% elif base_arch == 'ppc64le' %}
{% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud'
] %}
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
'centos-release-openstack-queens'
] %}
{% endif %}
{{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages")) }}
{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %}
{%- if loop.first %}RUN {% else %} && {% endif -%}

26
docker/base/aarch64-cbs.repo
View File

@ -1,26 +0,0 @@
[aarch64-opstools]
name=CentOS opstools repo
baseurl=https://buildlogs.centos.org/centos/7/opstools/aarch64
enabled=1
gpgcheck=0
[aarch64-ceph-luminous]
name=CentOS Storage SIG repo with Ceph Luminous
baseurl=https://buildlogs.centos.org/centos/7/storage/aarch64/ceph-luminous/
enabled=1
gpgcheck=0
# those three below are from delorean-deps.repo
# we are in a middle of sorting that out at RDO
[aarch64-kvm]
name=CentOS Virt SIG repo
baseurl=https://buildlogs.centos.org/centos/7/virt/aarch64/kvm-common/
enabled=1
gpgcheck=0
[centos-openstack-queens]
name=dlrn-pike-testing
baseurl=https://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-queens/
enabled=1
gpgcheck=0