diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 12:00:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 12:00:47 +0000 |
| commit | 632f1774b95dbbc9c96cb46d838665362c75d934 (patch) | |
| tree | 249dd18daf41c089ed3764ddfe3549c56a7a886a /docker/mariadb | |
| parent | a34a7a01a6050f2e0890023df308ca06a815cefe (diff) | |
| parent | f98a8d6287b8260f2d2731118cc40bfffe75b156 (diff) | |
| download | kolla-632f1774b95dbbc9c96cb46d838665362c75d934.tar.gz kolla-632f1774b95dbbc9c96cb46d838665362c75d934.zip | |
Merge "debian: move to stretch"
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 74834f9fb..5f4bc5da1 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -23,10 +23,18 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['debian', 'ubuntu'] %} {% set mariadb_packages = [ 'expect', - 'mariadb-galera-server', - 'percona-xtrabackup', 'socat' ] %} + {% if base_distro == 'debian' %} + {% set mariadb_packages = mariadb_packages + [ + 'mariadb-server' + ] %} + {% else %} + {% set mariadb_packages = mariadb_packages + [ + 'mariadb-galera-server', + 'percona-xtrabackup' + ] %} + {% endif %} {% endif %} {{ macros.install_packages(mariadb_packages | customizable("packages")) }} |
