do not set contentdir to 'centos' on 'rhel'
commit ec5daaaa63
wrongly did this for
rhel too
Change-Id: I202ea5341f8db315b90367cbdef5c7b26567738b
This commit is contained in:
parent
9ef9cbeb8f
commit
9723832192
|
@ -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 = [
|
||||
|
|
Loading…
Reference in New Issue