openstack
/
kolla
Code Issues Proposed changes

Merge "Add workaround for openstack-sahara-ui plugin"

This commit is contained in:
Jenkins 2017-08-01 13:29:58 +00:00 committed by Gerrit Code Review
parent 6e2130fdad 21f042b7f7
commit 3789d1a1b8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/horizon/Dockerfile.j2
View File

@ -38,6 +38,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& chown -R apache: /usr/share/openstack-dashboard/static \
&& sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
&& cp /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_18*.py* /usr/lib/python2.7/site-packages/sahara_dashboard/enabled/ \
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* \
&& rm -f /usr/lib/python2.7/site-packages/openstack_dashboard/local/enabled/?[^_]*.py* \
&& for locale in /usr/lib/python2.7/site-packages/*/locale; do \