diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-24 16:34:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-24 16:34:13 +0000 |
| commit | 128393b4ac6961e6da3f93da3e9a63057a540f81 (patch) | |
| tree | 47ee03769baf740a53d2ec94e2c49aafa0a09367 /docker/openstack-base | |
| parent | 77f50e57180fa25a49b30c2c306baab18553c3f0 (diff) | |
| parent | 21b04376e3339e1cb987e6877e8431ea054c6502 (diff) | |
| download | kolla-128393b4ac6961e6da3f93da3e9a63057a540f81.tar.gz kolla-128393b4ac6961e6da3f93da3e9a63057a540f81.zip | |
Merge "mariadb: handle lack of external repos on non x86"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 3ef0be3ac..719e737fb 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -212,7 +212,6 @@ ENV DEBIAN_FRONTEND noninteractive 'libxml2-devel', 'libxslt-devel', 'libyaml-devel', - 'MariaDB-devel', 'openldap-devel', 'openssl-devel', 'postgresql', @@ -221,6 +220,20 @@ ENV DEBIAN_FRONTEND noninteractive 'sqlite-devel', 'zip' ] %} + + # On x86-64 packages from external repos are used. lowercase names goes + # conflicts and build fails. Other architectures use standard CentOS + # packages. + {% if base_arch == 'x86_64' %} + {% set openstack_base_packages = openstack_base_packages + [ + 'MariaDB-devel' + ] %} + {% else %} + {% set openstack_base_packages = openstack_base_packages + [ + 'mariadb-devel' + ] %} + {% endif %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set openstack_base_packages = [ 'build-essential', |