openstack
/
kolla
Code Issues Proposed changes

Merge "base: do not set $contentdir for CentOS"

This commit is contained in:
Zuul 2018-08-14 12:05:36 +00:00 committed by Gerrit Code Review
parent c7b2bbf550 a922b332bc
commit 8d44e3b5a4
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/base/Dockerfile.j2
View File

@ -45,17 +45,6 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
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 %}
RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
{% endif %}
#### BEGIN REPO ENABLEMENT
{% set base_yum_repo_files = [
] %}