diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-14 12:05:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-14 12:05:36 +0000 |
| commit | 8d44e3b5a4837f454856b80f032c4ad17325a595 (patch) | |
| tree | 2fb0b7465ad05a66f418878ad09998c0e276c4cc | |
| parent | c7b2bbf550a9a02fda09e26362150129f3bb9588 (diff) | |
| parent | a922b332bc891c2f412abb7110b6484e9975b0d5 (diff) | |
| download | kolla-8d44e3b5a4837f454856b80f032c4ad17325a595.tar.gz kolla-8d44e3b5a4837f454856b80f032c4ad17325a595.zip | |
Merge "base: do not set $contentdir for CentOS"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index ac503e804..9826ac765 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 = [ ] %} |