summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2018-07-29 22:39:28 +0200
committerMartin André <m.andre@redhat.com>2018-07-29 22:39:28 +0200
commit3b9b69ac7b6b1e59ead77a7ebf8fd1273963e286 (patch)
treecc2b9d9837767a76854d9c1ec5ce0b20fafaff5a
parente4e8ca3e1d0656e2a07f6f718a92c03a54f6a9ee (diff)
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
Notes
Notes (review): Code-Review+1: Sagi Shnaidman <sshnaidm@redhat.com> Code-Review+2: Eduardo Gonzalez <dabarren@gmail.com> Code-Review+1: Juan Antonio Osorio Robles <jaosorior@redhat.com> Code-Review+2: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Workflow+1: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 30 Jul 2018 14:41:12 +0000 Reviewed-on: https://review.openstack.org/586904 Project: openstack/kolla Branch: refs/heads/master
-rw-r--r--docker/horizon/Dockerfile.j21
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 2d9eb62..ee5773b 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 \
41 && chown -R apache: /usr/share/openstack-dashboard/static \ 41 && chown -R apache: /usr/share/openstack-dashboard/static \
42 && sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \ 42 && sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \
43 && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ 43 && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
44 && cp /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_18*.py* /usr/lib/python2.7/site-packages/sahara_dashboard/enabled/ \
45 && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* \ 44 && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* \
46 && rm -f /usr/lib/python2.7/site-packages/openstack_dashboard/local/enabled/?[^_]*.py* \ 45 && rm -f /usr/lib/python2.7/site-packages/openstack_dashboard/local/enabled/?[^_]*.py* \
47 && for locale in /usr/lib/python2.7/site-packages/*/locale; do \ 46 && for locale in /usr/lib/python2.7/site-packages/*/locale; do \