diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-01 13:29:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-01 13:29:58 +0000 |
| commit | 3789d1a1b85cdbc2f82084ca858ca0df67444330 (patch) | |
| tree | 7d113333532163b1fa32dfb0fde5c918406a0b74 /docker | |
| parent | 6e2130fdad328ac3604fd4fc594de206e97a8cc2 (diff) | |
| parent | 21f042b7f7d8f99d17833ac0f76873a12c3aa2cb (diff) | |
| download | kolla-3789d1a1b85cdbc2f82084ca858ca0df67444330.tar.gz kolla-3789d1a1b85cdbc2f82084ca858ca0df67444330.zip | |
Merge "Add workaround for openstack-sahara-ui plugin"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index e14137df9..410f75ed4 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -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 \ |