diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-01 16:48:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-01 16:48:29 +0000 |
| commit | 887ed5310e801d7a3f7bc455663123fa1817be1f (patch) | |
| tree | 940bc78dfb359bbd7790510296051d770f4b297e /docker | |
| parent | cea799bd6a1c94ff731d038a8ff2187d0d0249be (diff) | |
| parent | c2960f73d2002264f627b79a1c052efdd29be852 (diff) | |
| download | kolla-887ed5310e801d7a3f7bc455663123fa1817be1f.tar.gz kolla-887ed5310e801d7a3f7bc455663123fa1817be1f.zip | |
Merge "Add octavia-dashboard to horizon image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index aa65c6f53..1197ef1a1 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -24,6 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-mistral-ui', 'openstack-murano-ui', 'openstack-neutron-lbaas-ui', + 'openstack-octavia-ui', 'openstack-sahara-ui', 'openstack-trove-ui', 'openstack-vitrage-ui' diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index a0e57e15d..ac660140c 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -141,6 +141,12 @@ function config_neutron_lbaas { "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py" } +function config_octavia_dashboard { + config_dashboard "${ENABLE_OCTAVIA}" \ + "${SITE_PACKAGES}/octavia_dashboard/enabled/_1482_project_load_balancer_panel.py" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py" +} + function config_sahara_dashboard { for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_SAHARA}" \ @@ -249,6 +255,7 @@ config_manila_ui config_mistral_dashboard config_murano_dashboard config_neutron_lbaas +config_octavia_dashboard config_sahara_dashboard config_searchlight_ui config_senlin_dashboard |