openstack/kolla
Code Issues Proposed changes

base: set $contentdir for CentOS

Browse Source 
CentOS recently started syncing alternate arch repos to mirrors. And to
make it easier to play with centos-* packages idea of 'contentdir'
appeared.

https://lists.centos.org/pipermail/centos-devel/2018-March/016542.html

Change-Id: Ieb26c0aa65ba3ec1a45a33f87f670e5ecb782f82
This commit is contained in:
Marcin Juszkiewicz 2018-05-13 18:16:11 +02:00
parent 000159cb6d
commit ec5daaaa63
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/base/Dockerfile.j2
View File

@ -40,8 +40,17 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
&& cat /tmp/kolla_bashrc >> /etc/bashrc \ && cat /tmp/kolla_bashrc >> /etc/bashrc \
&& sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/yum.conf && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/yum.conf
{% set centos_contentdir = 'centos' %}
{% if base_arch in ['aarch64', 'ppc64le'] %}
{% set centos_contentdir = 'altarch' %}
{% endif %}
{% block base_yum_conf %} {% block base_yum_conf %}
COPY yum.conf /etc/yum.conf COPY yum.conf /etc/yum.conf
RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
{% endblock %} {% endblock %}
#### BEGIN REPO ENABLEMENT #### BEGIN REPO ENABLEMENT