openstack
/
kolla
Code Issues Proposed changes

Merge "Add neutron-fwaas-dashboard into horizon image" into stable/pike

This commit is contained in:
Zuul 2017-11-12 07:45:18 +00:00 committed by Gerrit Code Review
parent 7dbd8c6346 0ce82858b3
commit 4f66636fab
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/horizon/extend_start.sh
View File

@ -56,6 +56,14 @@ function config_designate_dashboard {
done done
} }
function config_fwaas_dashboard {
for file in ${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/_*[^__].py; do
config_dashboard "${ENABLE_FWAAS}" \
"${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/${file##*/}" \
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
done
}
function config_freezer_ui { function config_freezer_ui {
for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do
config_dashboard "${ENABLE_FREEZER}" \ config_dashboard "${ENABLE_FREEZER}" \
@ -213,6 +221,7 @@ function config_zun_dashboard {
config_cloudkitty_dashboard config_cloudkitty_dashboard
config_designate_dashboard config_designate_dashboard
config_fwaas_dashboard
config_freezer_ui config_freezer_ui
config_ironic_dashboard config_ironic_dashboard
config_karbor_dashboard config_karbor_dashboard

4
kolla/common/config.py
View File

@ -358,6 +358,10 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/designate-dashboard/' 'location': ('$tarballs_base/designate-dashboard/'
'designate-dashboard-5.0.0.tar.gz')}, 'designate-dashboard-5.0.0.tar.gz')},
'horizon-plugin-fwaas-dashboard': {
'type': 'url',
'location': ('$tarballs_base/neutron-fwaas-dashboard/'
'neutron-fwaas-dashboard-1.0.0.tar.gz')},
'horizon-plugin-freezer-web-ui': { 'horizon-plugin-freezer-web-ui': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/freezer-web-ui/' 'location': ('$tarballs_base/freezer-web-ui/'