From 57ea8b19091502ccaa3665cb99c7e47a1be8802d Mon Sep 17 00:00:00 2001 From: Trevor Vardeman Date: Fri, 21 Sep 2018 10:50:30 -0500 Subject: [PATCH] Hardcoding x86_64 in template overrides for the opendaylight repository The opendaylight packages are built noarch, but hosted on a repo defined as x86_64. Hard-coding the URL for x86_64 allows the packages to be used on other architectures, and can be easily removed when the repositories become archful. Change-Id: Ie22471f68035e7a26458fb3361ccde86cc4089a1 --- container-images/tripleo_kolla_template_overrides.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 76b3fb277..86d959946 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -9,7 +9,11 @@ {% block opendaylight_header %} RUN echo $'[opendaylight-8-devel]\n\ name=OpenDaylight Oxygen repository\n\ -baseurl=https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel/\n\ +# The opendaylight packages are currently built noarch, but the repo hosting +# them is hard-coded as an x86_64 repository. To enable multiarch use of the +# packages, we can hard-code x86_64 below, and update when the repository +# definitions are archful. +baseurl=https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-x86_64-devel/\n\ enabled=1\n\ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo {% endblock %}