From 5cd872e62db0ea8c8ceede85046a34a829b492cf Mon Sep 17 00:00:00 2001 From: Peter Razumovsky Date: Fri, 9 Dec 2016 11:41:14 +0000 Subject: [PATCH] Add searchlight-ui plugin to dashboard If searchlight services are enabled, dashboard will display additional page "Search", which could be used for search by Searchlight. Also, fix sahara-dashboard copy command place to repair broken plugin. Change-Id: I72e70a9ab7a152a79e885c4669a02ad5611fb4f8 Depends-on: I3e57b9dda9ebe63afd0381d0f9bf2831c4464059 --- docker/horizon/Dockerfile.j2 | 8 ++++++-- service/files/defaults.yaml | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index b188856..72e8a22 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -10,13 +10,17 @@ RUN apt-get update \ {{ copy_sources("openstack/horizon", "/horizon") }} {{ copy_sources("openstack/sahara-dashboard", "/sahara-dashboard") }} {{ copy_sources("openstack/murano-dashboard", "/murano-dashboard") }} +{{ copy_sources("openstack/searchlight-ui", "/searchlight-ui") }} RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \ - && /var/lib/microservices/venv/bin/pip install --upgrade /horizon /sahara-dashboard /murano-dashboard \ + && cp -a /sahara-dashboard/sahara_dashboard/enabled/* /horizon/openstack_dashboard/local/enabled/ \ + && cp -a /searchlight-ui/searchlight_ui/enabled/_1001_project_search_panel.py /horizon/openstack_dashboard/local/enabled/ \ + && cp -a /searchlight-ui/searchlight_ui/conf/searchlight_policy.json /horizon/openstack_dashboard/conf/ \ + && cp -a /searchlight-ui/searchlight_ui/local_settings.d/_1001_search_settings.py /horizon/openstack_dashboard/local/local_settings.d/ \ + && /var/lib/microservices/venv/bin/pip install --upgrade /horizon /sahara-dashboard /murano-dashboard /searchlight-ui \ && useradd --user-group horizon \ && ln -s /etc/openstack-dashboard/local_settings /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ - && cp -a /sahara-dashboard/sahara_dashboard/enabled/* /horizon/openstack_dashboard/local/enabled/ \ && cp -r /murano-dashboard/muranodashboard/conf/* /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/conf/ \ && cp -a /murano-dashboard/muranodashboard/local/enabled/* /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/enabled/ \ && cp -a /murano-dashboard/muranodashboard/local/local_settings.d/* /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.d/ \ diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml index 3a067f6..0eb41da 100644 --- a/service/files/defaults.yaml +++ b/service/files/defaults.yaml @@ -20,3 +20,6 @@ sources: openstack/murano-dashboard: git_url: http://git.openstack.org/openstack/murano-dashboard.git git_ref: stable/newton + openstack/searchlight-ui: + git_url: https://git.openstack.org/openstack/searchlight-ui.git + git_ref: stable/newton