aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-20 12:00:47 +0000
committerGerrit Code Review <review@openstack.org>2017-04-20 12:00:47 +0000
commit632f1774b95dbbc9c96cb46d838665362c75d934 (patch)
tree249dd18daf41c089ed3764ddfe3549c56a7a886a /docker/kolla-toolbox
parenta34a7a01a6050f2e0890023df308ca06a815cefe (diff)
parentf98a8d6287b8260f2d2731118cc40bfffe75b156 (diff)
downloadkolla-632f1774b95dbbc9c96cb46d838665362c75d934.tar.gz
kolla-632f1774b95dbbc9c96cb46d838665362c75d934.zip
Merge "debian: move to stretch"
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j211
1 files changed, 8 insertions, 3 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index e15958af8..c2b6d1265 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -43,9 +43,14 @@ MAINTAINER {{ maintainer }}
'python-dev'
] %}
-{% if base_distro == 'debian' %}
- {% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %}
-{% endif %}
+ # Debian/stretch ships libmysqlclient.so in separate package
+ {% if base_distro == 'debian' %}
+ {% set kolla_toolbox_packages = kolla_toolbox_packages + [
+ 'libmariadbclient-dev-compat'
+ ] %}
+
+ {% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %}
+ {% endif %}
{% endif %}
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}