From ec5daaaa634351d24706e605c2c6726be402d35b Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Sun, 13 May 2018 18:16:11 +0200
Subject: [PATCH] base: set $contentdir for CentOS

CentOS recently started syncing alternate arch repos to mirrors. And to
make it easier to play with centos-* packages idea of 'contentdir'
appeared.

https://lists.centos.org/pipermail/centos-devel/2018-March/016542.html

Change-Id: Ieb26c0aa65ba3ec1a45a33f87f670e5ecb782f82
---
 docker/base/Dockerfile.j2 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 264d87dd27..926bb316e7 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -40,8 +40,17 @@ 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
 
+{% 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
+
 {% endblock %}
 
 #### BEGIN REPO ENABLEMENT