diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-13 12:01:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-13 12:01:22 +0000 |
| commit | 5e15e813c2360c96d7d0c7514fea4fd9cf65f3b9 (patch) | |
| tree | 1c3c4f093e31f6791adaed73a1e7ae395807d2ca /docker | |
| parent | 75cfac68e72026ee9855f4db5c5f16f9ab7a2e75 (diff) | |
| parent | d29333b7a8b24615397141958a6c7b5603d82efe (diff) | |
| download | kolla-5e15e813c2360c96d7d0c7514fea4fd9cf65f3b9.tar.gz kolla-5e15e813c2360c96d7d0c7514fea4fd9cf65f3b9.zip | |
Merge "Add missing Jinja2 block for repo enablement"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 220b126f7..bd3dec754 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -85,15 +85,19 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }} {% if install_metatype == 'rhos' %} +{% block base_rhos_repo_enablement %} # Turn on the RHOS 7.0 repo for RHOS RUN yum-config-manager --enable rhel-7-server-rpms \ && yum-config-manager --enable rhel-7-server-openstack-7.0-rpms +{% endblock %} {% endif %} {% if base_distro == 'centos' %} +{% block base_centos_gpg_key_import %} RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 +{% endblock %} {% set base_centos_yum_repo_keys = [ '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', @@ -107,12 +111,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'yum-plugin-priorities' ] %} -{{ macros.install_packages(base_centos_yum_repo_packages | customizable("yum_centos_repo_packages")) }} -{% for key in base_centos_yum_repo_keys | customizable('yum_centos_repo_keys') %} +{{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages")) }} +{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %} {%- if loop.first %}RUN {% else %} && {% endif -%} rpm --import {{ key }} \ {% endfor -%} -{%- if base_centos_yum_repo_keys|length ==0 %}RUN {% else %} && {% endif -%} +{%- if base_centos_yum_repo_keys|customizable('centos_yum_repo_keys')|length == 0 %}RUN {% else %} && {% endif -%} yum clean all {% endif %} |