openstack
/
kolla
Code Issues Proposed changes

Merge "do not set contentdir to 'centos' on 'rhel'"

This commit is contained in:
Zuul 2018-06-04 12:13:56 +00:00 committed by Gerrit Code Review
parent 3a65b17da7 9723832192
commit 578d3a8338
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/base/Dockerfile.j2
View File

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