diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-12 10:24:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-12 10:24:43 +0000 |
| commit | ab2f95ea46b6995e8e70dace53eb84c3a7800605 (patch) | |
| tree | d41569043187f524013203a07ec058b239d120fe /docker | |
| parent | 885ad4108966280107d598bac4741ff49b533c35 (diff) | |
| parent | ff93b3be20c288ce3570bc432310ecf717710313 (diff) | |
| download | kolla-ab2f95ea46b6995e8e70dace53eb84c3a7800605.tar.gz kolla-ab2f95ea46b6995e8e70dace53eb84c3a7800605.zip | |
Merge "openstack-base: Percona-Server is x86-64 only"
Diffstat (limited to 'docker')
| -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 |