From ff93b3be20c288ce3570bc432310ecf717710313 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Sat, 25 Mar 2017 20:53:14 +0100
Subject: openstack-base: Percona-Server is x86-64 only

Percona-Server-shared-56 package comes from external "x86-64 only"
repository so let's handle it properly.

Partially-Implements: blueprint multiarch-and-arm64-containers

Depends-On: I71ddb7ef57c64d2505cac96724b1ab6772a57d6a

Change-Id: I5158861d22df0e13f7c6abfb2f0f98d392827345
---
 docker/openstack-base/Dockerfile.j2 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'docker/openstack-base')

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 9dbd6246f..38edfcc08 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -40,7 +40,6 @@ MAINTAINER {{ maintainer }}
             'libxslt',
             'libyaml',
             'MySQL-python',
-            'Percona-Server-shared-56',
             'pyOpenSSL',
             'pyparsing',
             'python2-cffi',
@@ -161,6 +160,13 @@ MAINTAINER {{ maintainer }}
             'sysvinit-tools',
             'tcp_wrappers-libs'
         ] %}
+
+        {% if base_arch == 'x86_64' %}
+            {% set openstack_base_packages = openstack_base_packages + [
+                'Percona-Server-shared-56'
+            ] %}
+        {% endif %}
+
     {% elif base_distro in ['debian', 'ubuntu'] %}
 
 # This will prevent questions from being asked during the install
-- 
cgit v1.2.3