diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-03-25 20:53:14 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-06 13:13:12 +0200 |
| commit | ff93b3be20c288ce3570bc432310ecf717710313 (patch) | |
| tree | a1f3d36b58dfbeec2d7c6e02b7f5371b64d62580 | |
| parent | 3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7 (diff) | |
| download | kolla-ff93b3be20c288ce3570bc432310ecf717710313.tar.gz kolla-ff93b3be20c288ce3570bc432310ecf717710313.zip | |
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
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 8 |
1 files changed, 7 insertions, 1 deletions
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 |