From 3b9b69ac7b6b1e59ead77a7ebf8fd1273963e286 Mon Sep 17 00:00:00 2001 From: Martin André Date: Sun, 29 Jul 2018 22:39:28 +0200 Subject: Stop manually copying sahara-dashboard config files RDO review https://review.rdoproject.org/r/#/c/14081/ changed the locaction of the config files for the openstack-sahara-ui and added the symlinks to be more consistent with the other horizon plugins packages. It's not necessary anymore to treat sahara-ui as a snowflake and the old copy in horizon dockerfile must be removed. Change-Id: Ib222809ee67d103469e9d467727e0e45eaac77e8 Closes-Bug: #1784233 --- docker/horizon/Dockerfile.j2 | 1 - 1 file changed, 1 deletion(-) (limited to 'docker') diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 2d9eb624c..ee5773bb8 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -41,7 +41,6 @@ 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 \ -- cgit v1.2.3