openstack
/
kolla
Code Issues Proposed changes

handle mariadb for aarch64/ubuntu/source 

Ubuntu builds use external MariaDB repository on x86-64 and ppc64le. But
that repo does not provide packages for AArch64 so I use mariadb/mysql
packages from distribution instead.

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

Change-Id: Ia3c3d3858082613718626670f9ff11b69d913c40
This commit is contained in:
Marcin Juszkiewicz 2017-04-28 16:54:05 +02:00
parent 51e94df062
commit 4ff615d6d4
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/kolla-toolbox/Dockerfile.j2
View File

@ -50,13 +50,21 @@ LABEL maintainer="{{ maintainer }}"
'git',
'jq',
'libffi-dev',
'libmariadbclient-dev',
'libssl-dev',
'libxslt1-dev',
'mariadb-client',
'python-dev'
] %}
{% if base_arch == 'aarch64' and base_distro == 'ubuntu' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'libmysqlclient-dev'
] %}
{% else %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'libmariadbclient-dev'
] %}
{% endif %}
# Debian/stretch ships libmysqlclient.so in separate package
{% if base_distro == 'debian' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [

15
docker/mariadb/Dockerfile.j2
View File

@ -44,10 +44,17 @@ LABEL maintainer="{{ maintainer }}"
'mariadb-server'
] %}
{% else %}
{% set mariadb_packages = mariadb_packages + [
'mariadb-galera-server',
'percona-xtrabackup'
] %}
{% if base_arch == 'aarch64' %}
{% set mariadb_packages = mariadb_packages + [
'mariadb-server',
'percona-xtrabackup'
] %}
{% else %}
{% set mariadb_packages = mariadb_packages + [
'mariadb-galera-server',
'percona-xtrabackup'
] %}
{% endif %}
{% endif %}
{% endif %}

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

@ -240,7 +240,6 @@ ENV DEBIAN_FRONTEND noninteractive
'ca-certificates',
'git',
'libffi-dev',
'libmariadbclient-dev',
'libssl-dev',
'libxml2-dev',
'libxslt1-dev',
@ -251,6 +250,15 @@ ENV DEBIAN_FRONTEND noninteractive
'zip'
] %}
{% if base_arch == 'aarch64' and base_distro == 'ubuntu' %}
{% set openstack_base_packages = openstack_base_packages + [
'libmysqlclient-dev'
] %}
{% else %}
{% set openstack_base_packages = openstack_base_packages + [
'libmariadbclient-dev'
] %}
{% endif %}
# Debian/stretch ships libmysqlclient.so in separate package
{% if base_distro == 'debian' %}
{% set openstack_base_packages = openstack_base_packages + [