diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-28 18:06:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-28 18:06:06 +0000 |
| commit | 666531893cef0bf6fadae43c05d3906998cf8c6e (patch) | |
| tree | ba0db453bd8dd104881139af3407ae5c93db15c5 /docker | |
| parent | 1dd003a24b874b5f3715e7c661489f6ab2718bcc (diff) | |
| parent | d866c63a32a494b8643b166c3b1e36e463a7502f (diff) | |
| download | kolla-666531893cef0bf6fadae43c05d3906998cf8c6e.tar.gz kolla-666531893cef0bf6fadae43c05d3906998cf8c6e.zip | |
Merge "horizon: do not build neutron-vpnaas-dashboard for CentOS 7"
Diffstat (limited to 'docker')
| -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) }}; \ |