diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-10 09:19:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-10 09:19:06 +0000 |
| commit | 9a3192f570ef2d18018fce875164967c436a119b (patch) | |
| tree | fccd3c57375efdb6648d11d899447a5623e281b2 /docker | |
| parent | 9f9021ce59203bced2055d7ca66d828a4138e704 (diff) | |
| parent | 10abb20d6eec93ed3b8f22e6036b62fabbd0219d (diff) | |
| download | kolla-9a3192f570ef2d18018fce875164967c436a119b.tar.gz kolla-9a3192f570ef2d18018fce875164967c436a119b.zip | |
Merge "Install mistral dashboard into 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 b92bbab2f..bb156083b 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -15,6 +15,7 @@ MAINTAINER {{ maintainer }} 'gettext', 'openstack-cloudkitty-ui', 'openstack-manila-ui', + 'openstack-mistral-ui', 'openstack-neutron-lbaas-ui', 'openstack-sahara-ui', 'openstack-trove-ui', diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index fc3181791..a100a2c94 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" \ @@ -150,6 +156,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 |