openstack/kolla
Code Issues Proposed changes

Merge "handle mariadb for aarch64/ubuntu/source"

Browse Source
This commit is contained in:
Jenkins
2017-05-10 11:13:53 +00:00
committed by Gerrit Code Review
parent e4fa287158 4ff615d6d4
commit cf6209f2df
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,13 +49,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'git', 'git',
'jq', 'jq',
'libffi-dev', 'libffi-dev',
'libmariadbclient-dev',
'libssl-dev', 'libssl-dev',
'libxslt1-dev', 'libxslt1-dev',
'mariadb-client', 'mariadb-client',
'python-dev' '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 # Debian/stretch ships libmysqlclient.so in separate package
{% if base_distro == 'debian' %} {% if base_distro == 'debian' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [ {% set kolla_toolbox_packages = kolla_toolbox_packages + [

15
docker/mariadb/Dockerfile.j2
View File

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

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

@@ -240,7 +240,6 @@ ENV DEBIAN_FRONTEND noninteractive
'ca-certificates', 'ca-certificates',
'git', 'git',
'libffi-dev', 'libffi-dev',
'libmariadbclient-dev',
'libssl-dev', 'libssl-dev',
'libxml2-dev', 'libxml2-dev',
'libxslt1-dev', 'libxslt1-dev',
@@ -251,6 +250,15 @@ ENV DEBIAN_FRONTEND noninteractive
'zip' '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 # Debian/stretch ships libmysqlclient.so in separate package
{% if base_distro == 'debian' %} {% if base_distro == 'debian' %}
{% set openstack_base_packages = openstack_base_packages + [ {% set openstack_base_packages = openstack_base_packages + [