openstack/kolla
Code Issues Proposed changes

Merge "Install trove dashboard into horizon image"

Browse Source
This commit is contained in:
Jenkins 2016-12-01 21:41:19 +00:00 committed by Gerrit Code Review
commit 8b57bb070e
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/horizon/Dockerfile.j2
View File

@ -16,7 +16,9 @@ MAINTAINER {{ maintainer }}
'openstack-cloudkitty-ui', 'openstack-cloudkitty-ui',
'openstack-manila-ui', 'openstack-manila-ui',
'openstack-neutron-lbaas-ui', 'openstack-neutron-lbaas-ui',
'openstack-sahara-ui' 'openstack-sahara-ui',
'openstack-trove-ui'
] %} ] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }} {{ macros.install_packages(horizon_packages | customizable("packages")) }}
@ -33,7 +35,8 @@ RUN useradd --user-group horizon \
&& (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \ && (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* \ && 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/_18*_data_processing_*.py* \
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_database*.py*
{% endblock %} {% endblock %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

9
docker/horizon/extend_start.sh
View File

@ -73,11 +73,20 @@ function config_sahara_dashboard {
done done
} }
function config_trove_dashboard {
for file in ${SITE_PACKAGES}/trove_dashboard/enabled/_*[^__].py; do
config_dashboard "${ENABLE_TROVE}" \
"${SITE_PACKAGES}/trove_dashboard/enabled/${file##*/}" \
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
done
}
config_cloudkitty_dashboard config_cloudkitty_dashboard
config_ironic_dashboard config_ironic_dashboard
config_manila_ui config_manila_ui
config_neutron_lbaas config_neutron_lbaas
config_sahara_dashboard config_sahara_dashboard
config_trove_dashboard
# NOTE(pbourke): httpd will not clean up after itself in some cases which # NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. (bug #1489676, 1557036) # results in the container not being able to restart. (bug #1489676, 1557036)

4
kolla/common/config.py
View File

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