openstack
/
kolla
Code Issues Proposed changes

Merge "openstack-base: Percona-Server is x86-64 only"

This commit is contained in:
Jenkins 2017-04-12 10:24:43 +00:00 committed by Gerrit Code Review
parent 885ad41089 ff93b3be20
commit ab2f95ea46
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/openstack-base/Dockerfile.j2
View File

@ -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