horizon: do not build neutron-vpnaas-dashboard for CentOS 7
This plugin moved to Python 3 only: Change-Id: Ifa664ff2d65a7cbc969c4b1c279eae1ac21225d7 INFO:kolla.common.utils.horizon:[91mERROR: Package 'neutron-vpnaas-dashboard' requires a different Python: 2.7.5 not in '>=3.6'
This commit is contained in:
parent
b5cfa8ef73
commit
d866c63a32
|
@ -162,9 +162,9 @@ RUN ln -s horizon-source/* horizon \
|
||||||
&& cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \
|
&& 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/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings \
|
||||||
&& cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \
|
&& 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') %}
|
{% 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 %}
|
{% endif %}
|
||||||
&& if [ "$(ls /plugins)" ]; then \
|
&& if [ "$(ls /plugins)" ]; then \
|
||||||
{{ macros.install_pip(horizon_plugins_pip_packages) }}; \
|
{{ macros.install_pip(horizon_plugins_pip_packages) }}; \
|
||||||
|
|
Loading…
Reference in New Issue