diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-25 10:31:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-25 10:31:40 +0000 |
| commit | 859b861df9d3b191e8d6eb20f5d5166493f9f69d (patch) | |
| tree | ac689ffb758b4f7b30b3fc01d1146e23eb8b9458 | |
| parent | 7b24bffce83908362e2efaadfdb86e0e4ace9986 (diff) | |
| parent | 7d7005e412f59028b00369ec7ab4997aa5d177f9 (diff) | |
| download | kolla-859b861df9d3b191e8d6eb20f5d5166493f9f69d.tar.gz kolla-859b861df9d3b191e8d6eb20f5d5166493f9f69d.zip | |
Merge "Add neutron-fwaas-dashboard into horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 418bc40ba..447d2a723 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -56,6 +56,14 @@ function config_designate_dashboard { 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 { for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do config_dashboard "${ENABLE_FREEZER}" \ @@ -213,6 +221,7 @@ function config_zun_dashboard { config_cloudkitty_dashboard config_designate_dashboard +config_fwaas_dashboard config_freezer_ui config_ironic_dashboard config_karbor_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index e39583db7..6b2c83a6e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -359,6 +359,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/designate-dashboard/' 'designate-dashboard-master.tar.gz')}, + 'horizon-plugin-fwaas-dashboard': { + 'type': 'url', + 'location': ('$tarballs_base/neutron-fwaas-dashboard/' + 'neutron-fwaas-dashboard-master.tar.gz')}, 'horizon-plugin-freezer-web-ui': { 'type': 'url', 'location': ('$tarballs_base/freezer-web-ui/' |