diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-21 05:42:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-21 05:42:45 +0000 |
| commit | 2f5b43e4b72e1d481083524a0b37c83f595fb600 (patch) | |
| tree | ad7ab546d4f017d3139d39c60fe515fe688b0230 | |
| parent | 6176867785b212d57c7efd4b62759e9b1807f94d (diff) | |
| parent | 1cde66e4d74f981253869b85d3fdce6baa92008e (diff) | |
| download | kolla-2f5b43e4b72e1d481083524a0b37c83f595fb600.tar.gz kolla-2f5b43e4b72e1d481083524a0b37c83f595fb600.zip | |
Merge "Fix the ubuntu binary gate"
| -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 %} |