diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-09-13 17:32:01 +0200 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-09-18 10:24:19 +0200 |
| commit | bc52005ac0af69bce31512584775c991b1aa6326 (patch) | |
| tree | a41ffe97061af0a28f0e06e8f89ac180e16b5e84 /docker/dind | |
| parent | 8a4ca1af426c37e7268a34382b6bb788f3ecb1c6 (diff) | |
| download | kolla-bc52005ac0af69bce31512584775c991b1aa6326.tar.gz kolla-bc52005ac0af69bce31512584775c991b1aa6326.zip | |
Fix dind and zun images and oraclelinux build
- dind need setuptools to install docker
through pip in binary install
- oraclelinux fails to install due opstools
repo and openstack mitaka repos missing.
- zun removed moved nova out of etc because is not
used. https://github.com/openstack/zun/commit/6dc286616727fde6e4d22b415bd961ebd8854920
Change-Id: Ic4eb0f2e97a108be3c854c95eede27b5cd411b5c
Closes-Bug: #1716952
Diffstat (limited to 'docker/dind')
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 86783be1a..48193c7c9 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -18,6 +18,12 @@ RUN /bin/true 'docker-engine', 'openssh-server' ] %} + + {% if install_type == 'binary' %} + {% set dind_packages = dind_packages + [ + 'python-setuptools' + ] %} + {% endif %} {{ macros.install_packages(dind_packages | customizable("packages")) }} {% set dind_pip_packages = [ |