aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-29 05:15:06 +0000
committerGerrit Code Review <review@openstack.org>2017-08-29 05:15:06 +0000
commitcf9a6c95bc08aeb4be842874dcee02fad216fbe2 (patch)
treea0cd911c78887ef0ef65c3450f65c8d1868b42a0 /docker
parent06deb74d58ad342832978150bce9ac97b33e5808 (diff)
parent0f3ebcac8bc400f6b546c893f61e97468219a056 (diff)
downloadkolla-cf9a6c95bc08aeb4be842874dcee02fad216fbe2.tar.gz
kolla-cf9a6c95bc08aeb4be842874dcee02fad216fbe2.zip
Merge "kolla-toolbox: fix version dependency of pbr & os-client-config"
Diffstat (limited to 'docker')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 72b5a5c95..c20643387 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -86,7 +86,8 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
{% set kolla_toolbox_pip_packages = [
'ansible==2.2.0.0',
'MySQL-python',
- 'os-client-config==1.26.0',
+ 'os-client-config==1.28.0',
+ 'pbr==2.0.0',
'pymongo',
'pytz',
'pyudev',