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. 6dc2866167
Change-Id: Ic4eb0f2e97a108be3c854c95eede27b5cd411b5c
Closes-Bug: #1716952
This commit is contained in:
parent
8a4ca1af42
commit
bc52005ac0
|
@ -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 \
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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 %}
|
||||
|
|
Loading…
Reference in New Issue