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 | |
| 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
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/zun/zun-base/Dockerfile.j2 | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 803bd5f4b..eab6ce537 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -186,9 +186,8 @@ RUN yum -y install \ yum-utils \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ && rpm -Uvh --nodeps \ - https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-jewel-1.0-1.el7.centos.noarch.rpm \ - http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-6.el7.centos.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-7.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-1.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-1-2.el7.centos.noarch.rpm \ 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 = [ diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index 662421394..2fbff31e5 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -52,7 +52,6 @@ RUN ln -s zun-base-source/* zun \ && mkdir -p /etc/zun /var/www/cgi-bin/zun \ && cp -r /zun/etc/zun/* /etc/zun/ \ && cp /zun/zun/api/app.wsgi /var/www/cgi-bin/zun \ - && cp -r /zun/etc/nova /etc/zun/ \ && chown -R zun: /etc/zun /var/www/cgi-bin/zun {% endif %} |