From 0f3ebcac8bc400f6b546c893f61e97468219a056 Mon Sep 17 00:00:00 2001 From: Zhangfei Gao Date: Wed, 9 Aug 2017 14:32:55 +0800 Subject: kolla-toolbox: fix version dependency of pbr & os-client-config When deploying on arm64, got error: ContextualVersionConflict: (pbr 1.10.0 (/usr/local/lib/python2.7/dist-packages), Requirement.parse('pbr!=2.1.0,>=2.0.0'), ContextualVersionConflict: (os-client-config 1.26.0 (/usr/local/lib/python2.7/dist-packages), Requirement.parse('os-client-config>=1.27.0'), set(['openstacksdk', 'osc-lib'])) VersionConflict: (os-client-config 1.27.0 (/usr/local/lib/python2.7/dist-packages), Requirement.parse('os-client-config>=1.28.0')) Fix the issue via updating pbr & os-client-config version Change-Id: If567489daecc53054535452069bce6d56c96efd1 Signed-off-by: Kevin Zhao Signed-off-by: Zhangfei Gao --- docker/kolla-toolbox/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') 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', -- cgit v1.2.3