openstack
/
kolla
Code Issues Proposed changes

Merge "Install sahara dashboard into horizon image"

This commit is contained in:
Jenkins 2016-11-28 16:23:20 +00:00 committed by Gerrit Code Review
parent c57cdb6edf 366250467d
commit 1cffe8a8dc
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/horizon/Dockerfile.j2
View File

@ -13,7 +13,8 @@ MAINTAINER {{ maintainer }}
'httpd',
'mod_wsgi',
'gettext',
'openstack-neutron-lbaas-ui'
'openstack-neutron-lbaas-ui',
'openstack-sahara-ui'
] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
@ -29,7 +30,8 @@ RUN useradd --user-group horizon \
&& 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) \
&& 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/_148*_project*loadbalancersv2_panel.py* \
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_18*_data_processing_*.py*
{% endblock %}
{% elif base_distro in ['ubuntu'] %}

9
docker/horizon/extend_start.sh
View File

@ -49,6 +49,15 @@ function config_neutron_lbaas {
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py"
}
function config_sahara_dashboard {
for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do
config_dashboard "${ENABLE_SAHARA}" \
"${SITE_PACKAGES}/sahara_dashboard/enabled/${file##*/}" \
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
done
}
config_sahara_dashboard
config_ironic_dashboard
config_neutron_lbaas

4
kolla/common/config.py
View File

@ -222,6 +222,10 @@ SOURCES = {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/'
'neutron-lbaas-dashboard-master.tar.gz')},
'horizon-plugin-sahara-dashboard': {
'type': 'url',
'location': ('http://tarballs.openstack.org/sahara-dashboard/'
'sahara-dashboard-master.tar.gz')},
'ironic-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/ironic/'