aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2018-05-21 12:05:16 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2018-05-21 12:05:16 +0100
commit750a012d05a49a64f611633b9b37ef4f417deb35 (patch)
tree485ef6d041b6b2e21acc6f53e4b6dad875fbfea4 /docker
parent0df99d5f188d194cbf5f584938d277aec5919cb2 (diff)
downloadkolla-750a012d05a49a64f611633b9b37ef4f417deb35.tar.gz
kolla-750a012d05a49a64f611633b9b37ef4f417deb35.zip
kolla-toolbox: fix os_config_client path for Debian
(venv-for-kolla) 12:04 (438s) linaro@c1n1:kolla$ docker run -it -u root haerwu/debian-source-kolla-toolbox:6.0.0 bash ()[root@f93a6cc8afb2 /]# find / -name defaults.json /opt/ansible/lib/python2.7/site-packages/openstack/config/defaults.json /opt/ansible/lib/python2.7/site-packages/os_client_config/defaults.json And we were looking at wrong path: Change-Id: I4fd403f0f0cff0628e93872d9f0d2f56591980f9 00:33:42.029 ERROR:kolla.common.utils.kolla-toolbox:The command '/bin/sh -c pip --no-cache-dir install --upgrade ansible==2.2.0.0 MySQL-python os-client-config==1.29.0 pbr==4.0.0 pymongo python-openstackclient==3.14.0 pytz pyudev shade==1.27.1 && mkdir -p /etc/ansible /usr/share/ansible && echo 'localhost ansible_connection=local ansible_python_interpreter=/opt/ansible/bin/python' > /etc/ansible/hosts && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' /usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' returned a non-zero code: 2 00:33:42.029 INFO:kolla.common.utils:Attempt number: 2 to run task: BuildTask(kolla-toolbox)
Diffstat (limited to 'docker')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j22
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 448688b51..03458e261 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -57,8 +57,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% 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 %}