Browse Source

Merge "horizon: do not build neutron-vpnaas-dashboard for CentOS 7"

changes/31/695931/3
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
666531893c
  1. 4
      docker/horizon/Dockerfile.j2

4
docker/horizon/Dockerfile.j2

@ -162,9 +162,9 @@ RUN ln -s horizon-source/* horizon \
&& cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \
&& cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings \
&& cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \
{# NOTE(hrw) searchlight moved to Python 3 and CentOS 7 uses Python 2 #}
{# NOTE(hrw) some plugins already moved to Python 3 and CentOS 7 uses Python 2 #}
{% if base_package_type == 'rpm' and base_distro_tag.startswith('7') %}
&& rm -rf /plugins/searchlight-ui* \
&& rm -rf /plugins/searchlight-ui* /plugins/neutron-vpnaas-dashboard* \
{% endif %}
&& if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(horizon_plugins_pip_packages) }}; \

Loading…
Cancel
Save