aboutsummaryrefslogtreecommitdiff
path: root/docker
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 /docker
parente4e8ca3e1d0656e2a07f6f718a92c03a54f6a9ee (diff)
downloadkolla-3b9b69ac7b6b1e59ead77a7ebf8fd1273963e286.tar.gz
kolla-3b9b69ac7b6b1e59ead77a7ebf8fd1273963e286.zip
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
Diffstat (limited to 'docker')
-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 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 \