From d29333b7a8b24615397141958a6c7b5603d82efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 7 Apr 2017 10:33:01 +0200 Subject: [PATCH] Add missing Jinja2 block for repo enablement Also fix wrong variable name passed to the `customizable` macro that prevented them to be customizable. Change-Id: Iabd040309490c64c2365f55d4bc0beb1a79717f4 Closes-Bug: #1680744 --- docker/base/Dockerfile.j2 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 220b126f7d..bd3dec7546 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 %}