diff options
| author | Mark Goddard <mark@stackhpc.com> | 2017-06-05 19:11:46 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2017-06-21 11:07:03 +0100 |
| commit | 21f042b7f7d8f99d17833ac0f76873a12c3aa2cb (patch) | |
| tree | 8a859aaadb9df638fdc654365aa5faf45920c555 /docker | |
| parent | 2627e3c009b580ef7f28eb3814f019f456674b3f (diff) | |
| download | kolla-21f042b7f7d8f99d17833ac0f76873a12c3aa2cb.tar.gz kolla-21f042b7f7d8f99d17833ac0f76873a12c3aa2cb.zip | |
Add workaround for openstack-sahara-ui plugin
The openstack-sahara-ui package in RDO doesn't include the python plugin
scripts in its enabled directory as they are moved rather than copied
into /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/.
This change copies the plugins into the sahara_dashboard python package
directory before they are removed from /usr/share.
Change-Id: Ifbaff505fe3b415e4598ee1a223fb823d2d71b43
Closes-Bug: #1698462
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 92ee2cd99..b6d959b1b 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* \ && (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \ |