diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/mariadb | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index d45085456..8777112a1 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -9,23 +9,23 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set mariadb_packages = [ - 'MariaDB-Galera-server', - 'MariaDB-client', - 'rsync', + 'expect', 'galera', - 'socat', 'hostname', + 'MariaDB-client', + 'MariaDB-Galera-server', 'percona-xtrabackup', 'pv', - 'tar', - 'expect' + 'rsync', + 'socat', + 'tar' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set mariadb_packages = [ + 'expect', 'mariadb-galera-server', 'percona-xtrabackup', - 'socat', - 'expect' + 'socat' ] %} {% endif %} |
