diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-11 06:20:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-11 06:20:33 +0000 |
| commit | 88fc252bc0efab812e926a6975cddd2bb7c3f11d (patch) | |
| tree | f56df649ef91ba34e48cc4f8e74bcea8b4b6e99c /docker/horizon/Dockerfile.j2 | |
| parent | 8ca934139ecfae41821d903557dd3842502afef5 (diff) | |
| parent | c89cbff6a225de678d3ae7a3941169a9661fb49a (diff) | |
| download | kolla-88fc252bc0efab812e926a6975cddd2bb7c3f11d.tar.gz kolla-88fc252bc0efab812e926a6975cddd2bb7c3f11d.zip | |
Merge "Fix neutron lbaas dashboard"
Diffstat (limited to 'docker/horizon/Dockerfile.j2')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index cdaa8288c..d4a9ab780 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -12,7 +12,8 @@ MAINTAINER {{ maintainer }} 'openstack-dashboard', 'httpd', 'mod_wsgi', - 'gettext' + 'gettext', + 'openstack-neutron-lbaas-ui' ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} @@ -27,7 +28,8 @@ RUN useradd --user-group horizon \ && sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \ && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ && (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \ - && (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) + && (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) \ + && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_148*_project*loadbalancersv2_panel.py* {% endblock %} {% elif base_distro in ['ubuntu'] %} @@ -105,8 +107,6 @@ RUN ln -s horizon-source/* horizon \ && cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \ && if [ "$(ls /plugins)" ]; then \ pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \ - ln -s `find /plugins -name 'neutron-lbaas-dashboard-*' -type d`/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py \ - /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py; \ fi \ && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/horizon && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ |