diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-24 15:04:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-24 15:04:19 +0000 |
| commit | d025182ed59ae79c98f0e1fd97f27a001fa4580c (patch) | |
| tree | 63c9a2374ab2721060dffab541f156832d7fa422 /docker/horizon | |
| parent | f980d319d55f613ab3adfe99f9ac965785ba76e0 (diff) | |
| parent | 32e68de94c5e59e2ccb05bad43ac89d6ea5e7146 (diff) | |
| download | kolla-d025182ed59ae79c98f0e1fd97f27a001fa4580c.tar.gz kolla-d025182ed59ae79c98f0e1fd97f27a001fa4580c.zip | |
Merge "install murano dashboard package in horizon"
Diffstat (limited to 'docker/horizon')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index aac9e468a..c94d2753b 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -18,6 +18,7 @@ MAINTAINER {{ maintainer }} 'openstack-cloudkitty-ui', 'openstack-manila-ui', 'openstack-mistral-ui', + 'openstack-murano-ui', 'openstack-neutron-lbaas-ui', 'openstack-sahara-ui', 'openstack-trove-ui' @@ -33,12 +34,10 @@ 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 \ + && 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) \ - && (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* \ - && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_18*_data_processing_*.py* \ - && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_database*.py* \ - && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_panel*.py* + && (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) {% endblock %} {% elif base_distro in ['ubuntu'] %} @@ -48,7 +47,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'apache2', 'libapache2-mod-wsgi', 'gettext', - 'python-manila-ui' + 'python-manila-ui', + 'python-murano-dashboard' ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 20281e21c..bba3f66bd 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -83,6 +83,21 @@ function config_manila_ui { done } +function config_murano_dashboard { + for file in ${SITE_PACKAGES}/muranodashboard/local/enabled/_*[^__].py; do + config_dashboard "${ENABLE_MURANO}" \ + "${SITE_PACKAGES}/muranodashboard/local/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done + config_dashboard "${ENABLE_MURANO}"\ + "${SITE_PACKAGES}/muranodashboard/conf/murano_policy.json" \ + "${SITE_PACKAGES}/openstack_dashboard/conf/murano_policy.json" + + config_dashboard "${ENABLE_MURANO}"\ + "${SITE_PACKAGES}/muranodashboard/local/local_settings.d/_50_murano.py" \ + "${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_50_murano.py" +} + function config_mistral_dashboard { config_dashboard "${ENABLE_MISTRAL}" \ "${SITE_PACKAGES}/mistral_dashboard/_50_mistral.py.example" \ @@ -174,6 +189,7 @@ config_karbor_dashboard config_magnum_dashboard config_manila_ui config_mistral_dashboard +config_murano_dashboard config_neutron_lbaas config_sahara_dashboard config_searchlight_ui |