From e5e8c2b85510a04d080d24a1d0f7145954194dd8 Mon Sep 17 00:00:00 2001 From: Peter Razumovsky Date: Tue, 17 Jan 2017 17:08:21 +0400 Subject: [PATCH] Fix searchlight-ui configuring for mitaka Searchlight-ui has no policy and settings files in mitaka, so need to add check for cp, if they are exist. Change-Id: Ie0a7159144fda111cedfbd031c28de3059a8b2d2 --- docker/horizon/Dockerfile.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index baa6cde..4b5dac2 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -15,8 +15,10 @@ RUN apt-get update \ RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \ && 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/ \ + && (if [ -f /searchlight-ui/searchlight_ui/conf/searchlight_policy.json ]; then \ + cp -a /searchlight-ui/searchlight_ui/conf/searchlight_policy.json /horizon/openstack_dashboard/conf/; fi) \ + && (if [ -f /searchlight-ui/searchlight_ui/local_settings.d/_1001_search_settings.py ]; then \ + cp -a /searchlight-ui/searchlight_ui/local_settings.d/_1001_search_settings.py /horizon/openstack_dashboard/local/local_settings.d/; fi) \ && /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 \