openstack/kolla
Code Issues Proposed changes

Merge "Install zun ui into horizon image"

Browse Source
This commit is contained in:
Jenkins 2017-07-04 10:49:22 +00:00 committed by Gerrit Code Review
commit c3635c5beb
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

@ -198,6 +198,14 @@ function config_zaqar_dashboard {
done done
} }
function config_zun_dashboard {
for file in ${SITE_PACKAGES}/zun_ui/enabled/_*[^__].py; do
config_dashboard "${ENABLE_ZUN}" \
"${SITE_PACKAGES}/zun_ui/enabled/${file##*/}" \
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
done
}
config_cloudkitty_dashboard config_cloudkitty_dashboard
config_designate_dashboard config_designate_dashboard
config_freezer_ui config_freezer_ui
@ -216,6 +224,7 @@ config_tacker_dashboard
config_trove_dashboard config_trove_dashboard
config_watcher_dashboard config_watcher_dashboard
config_zaqar_dashboard config_zaqar_dashboard
config_zun_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

@ -417,6 +417,10 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/zaqar-ui/' 'location': ('$tarballs_base/zaqar-ui/'
'zaqar-ui-master.tar.gz')}, 'zaqar-ui-master.tar.gz')},
'horizon-plugin-zun-ui': {
'type': 'url',
'location': ('$tarballs_base/zun-ui/'
'zun-ui-master.tar.gz')},
'ironic-base': { 'ironic-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/ironic/' 'location': ('$tarballs_base/ironic/'