diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-28 09:58:45 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-28 09:58:45 +0100 |
| commit | d866c63a32a494b8643b166c3b1e36e463a7502f (patch) | |
| tree | a61d1a34feac086b6dcfb20368dcde5c61e2ae44 | |
| parent | b5cfa8ef73e64ba6a74eb579310b3419b7d70c94 (diff) | |
| download | kolla-d866c63a32a494b8643b166c3b1e36e463a7502f.tar.gz kolla-d866c63a32a494b8643b166c3b1e36e463a7502f.zip | |
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'
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 34fa3ac3e..afbca6834 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/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) }}; \ |