openstack
/
kolla
Code Issues Proposed changes

Merge "Install mistral dashboard into horizon image"

This commit is contained in:
Jenkins 2016-12-10 09:19:06 +00:00 committed by Gerrit Code Review
parent 9f9021ce59 10abb20d6e
commit 9a3192f570
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/horizon/Dockerfile.j2
View File

@ -15,6 +15,7 @@ MAINTAINER {{ maintainer }}
'gettext',
'openstack-cloudkitty-ui',
'openstack-manila-ui',
'openstack-mistral-ui',
'openstack-neutron-lbaas-ui',
'openstack-sahara-ui',
'openstack-trove-ui',

7
docker/horizon/extend_start.sh
View File

@ -75,6 +75,12 @@ function config_manila_ui {
done
}
function config_mistral_dashboard {
config_dashboard "${ENABLE_MISTRAL}" \
"${SITE_PACKAGES}/mistral_dashboard/_50_mistral.py.example" \
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_mistral.py"
}
function config_neutron_lbaas {
config_dashboard "${ENABLE_NEUTRON_LBAAS}" \
"${SITE_PACKAGES}/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py" \
@ -150,6 +156,7 @@ config_designate_dashboard
config_ironic_dashboard
config_magnum_dashboard
config_manila_ui
config_mistral_dashboard
config_neutron_lbaas
config_sahara_dashboard
config_searchlight_ui

4
kolla/common/config.py
View File

@ -226,6 +226,10 @@ SOURCES = {
'type': 'url',
'location': ('http://tarballs.openstack.org/manila-ui/'
'manila-ui-master.tar.gz')},
'horizon-plugin-mistral-ui': {
'type': 'url',
'location': ('http://tarballs.openstack.org/mistral-dashboard/'
'mistral-dashboard-master.tar.gz')},
'horizon-plugin-neutron-lbaas-dashboard': {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/'