diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2018-08-20 16:49:38 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2018-08-21 00:01:39 +0800 |
| commit | 1cde66e4d74f981253869b85d3fdce6baa92008e (patch) | |
| tree | c0f8c06e3771e21359b6020af315ed87e5813e16 /docker | |
| parent | 989306a98e4de9501fe2e14ede80449c4a026992 (diff) | |
| download | kolla-1cde66e4d74f981253869b85d3fdce6baa92008e.tar.gz kolla-1cde66e4d74f981253869b85d3fdce6baa92008e.zip | |
Fix the ubuntu binary gate
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index ee5773bb8..aec738f05 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -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 diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 2e828a9de..13735a364 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -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 %} |