openstack
/
kolla
Code Issues Proposed changes

install murano dashboard package in horizon 

Change-Id: I96408b734eb4bc51d9acaa686d139a1653bff453
Closes-Bug: #1640679
This commit is contained in:
Jeffrey Zhang 2016-11-05 02:28:02 +08:00 committed by Jeffrey Zhang
parent dc063ce776
commit 32e68de94c
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/horizon/Dockerfile.j2
View File

@ -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")) }}

16
docker/horizon/extend_start.sh
View File

@ -75,6 +75,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" \
@ -163,6 +178,7 @@ config_ironic_dashboard
config_magnum_dashboard
config_manila_ui
config_mistral_dashboard
config_murano_dashboard
config_neutron_lbaas
config_sahara_dashboard
config_searchlight_ui

5
kolla/common/config.py
View File

@ -317,6 +317,11 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/monasca-ui/'
'monasca-ui-1.2.1.tar.gz')},
'horizon-plugin-murano-dashboard': {
'type': 'url',
'location': ('$tarballs_base/murano-dashboard/'
'murano-dashboard-master.tar.gz')},
'horizon-plugin-neutron-lbaas-dashboard': {
'type': 'url',
'location': ('$tarballs_base/neutron-lbaas-dashboard/'