openstack/kolla
Code Issues Proposed changes

Fix the ubuntu binary gate

Browse Source 
1. openstack-dashboard package already configured the folders as
   expected.
2. UCA is not include python-vmware-nsx 13.0.0 package now.

Change-Id: I7cb0c4d3d872333dadd2eecd7071e8f08c21a44d
This commit is contained in:
Jeffrey Zhang 2018-08-20 16:49:38 +08:00
parent 989306a98e
commit 1cde66e4d7
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/horizon/Dockerfile.j2
View File

@ -75,12 +75,6 @@ RUN echo > /etc/apache2/ports.conf \
&& cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
&& rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
&& rm /etc/openstack-dashboard/local_settings.py \
&& rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
&& rm -rf /usr/lib/python2.7/site-packages/openstack_dashboard \
&& ln -s /etc/openstack-dashboard/local_settings /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
&& ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python2.7/site-packages/openstack_dashboard \
&& ln -s /usr/share/openstack-dashboard/static /usr/lib/python2.7/site-packages/static \
&& for locale in /usr/lib/python2.7/site-packages/*/locale; do \
(cd ${locale%/*} && /usr/bin/python /usr/bin/manage.py compilemessages) \
done

6
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -49,6 +49,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_distro in ['ubuntu'] %}
# FIXED(jeffrey4l): UCA rocky release is not include python-vmware-nsx
# 13.0.0 package now. add 'python-vmware-nsx' into
# neutron_base_packages list after UCA fixed the issue.
{% set neutron_base_packages = [
'iproute2',
'iputils-ping',
@ -62,8 +65,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-networking-sfc',
'python-neutron-fwaas',
'python-openvswitch',
'python-oslo.vmware',
'python-vmware-nsx'
'python-oslo.vmware'
] %}
{% endif %}