aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorcaoyuan <cao.yuan@99cloud.net>2016-12-05 14:20:10 +0800
committercaoyuan <cao.yuan@99cloud.net>2016-12-09 07:00:41 +0000
commit10abb20d6eec93ed3b8f22e6036b62fabbd0219d (patch)
tree52e3bd40dda6ec17a47d6f83075106328ea71cbe /docker
parent0b16839184ef3c78ae678a5e1d474c36bcdd9f80 (diff)
downloadkolla-10abb20d6eec93ed3b8f22e6036b62fabbd0219d.tar.gz
kolla-10abb20d6eec93ed3b8f22e6036b62fabbd0219d.zip
Install mistral dashboard into horizon image
Change-Id: I37c73e6304ed005fe019dcdd105c1f333137fa60 Closes-Bug: #1647267
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/Dockerfile.j22
-rw-r--r--docker/horizon/extend_start.sh7
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 8baf048d1..bb156083b 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -15,11 +15,11 @@ MAINTAINER {{ maintainer }}
'gettext',
'openstack-cloudkitty-ui',
'openstack-manila-ui',
+ 'openstack-mistral-ui',
'openstack-neutron-lbaas-ui',
'openstack-sahara-ui',
'openstack-trove-ui',
'openstack-zaqar-ui'
-
] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 050eb289a..16add5b66 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -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" \
@@ -138,6 +144,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