diff options
| author | Benedikt Trefzer <benedikt.trefzer@cirrax.com> | 2016-03-24 14:10:46 +0100 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-06-04 03:44:23 +0000 |
| commit | 5df0903cfa2bf3a3990786a4bfc37c6f53b29d76 (patch) | |
| tree | 9cba3e0172d8281f609a813f804544c45e12d168 /docker | |
| parent | f43a2ecf380b19d31072e87a6d8ba2442763f2b2 (diff) | |
| download | kolla-5df0903cfa2bf3a3990786a4bfc37c6f53b29d76.tar.gz kolla-5df0903cfa2bf3a3990786a4bfc37c6f53b29d76.zip | |
Make container kolla-toolbox build with debian
- handle different path for os_client_config
Change-Id: I1134a932845ee22e8318c14ec02f0478eee11b9a
Partially-implements: blueprint build-debian
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index c206610b2..061dab08f 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} +{% set os_client_config='/usr/lib/python2.7/site-packages/os_client_config/defaults.json' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ @@ -29,6 +31,10 @@ RUN apt-get -y --no-install-recommends install \ python-dev \ && apt-get clean +{% if base_distro == 'debian' %} + {% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %} +{% endif %} + {% endif %} RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ @@ -50,7 +56,7 @@ RUN git clone https://github.com/ansible/ansible.git \ RUN useradd --user-group ansible --groups kolla \ && mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \ - && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' /usr/lib/python2.7/site-packages/os_client_config/defaults.json + && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py kolla_zookeeper.py /usr/share/ansible/ COPY ansible.cfg /home/ansible/.ansible.cfg |