From 0460663296c1a89ff06c3c6542592fc033a7290e Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Thu, 19 Apr 2018 22:27:30 +0800
Subject: [PATCH] Add blazar-dashboard into Horizon
Change-Id: Ie1ce8f29199dc36c0fe7671be48e7a655d997eb1
Deponds-on: I67876c734d147593a188ba385b60e02350b44fae
---
ansible/group_vars/all.yml | 1 +
ansible/roles/horizon/defaults/main.yml | 1 +
etc/kolla/globals.yml | 1 +
releasenotes/notes/add-blazar-dashboard-g6595d27c034f8xc.yaml | 2 ++
4 files changed, 5 insertions(+)
create mode 100644 releasenotes/notes/add-blazar-dashboard-g6595d27c034f8xc.yaml
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 5ad218ab8d..6465d9c111 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -415,6 +415,7 @@ enable_gnocchi: "no"
enable_grafana: "no"
enable_heat: "yes"
enable_horizon: "yes"
+enable_horizon_blazar: "{{ enable_blazar | bool }}"
enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}"
enable_horizon_designate: "{{ enable_designate | bool }}"
enable_horizon_fwaas: "{{ enable_neutron_fwaas | bool }}"
diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
index 1dd11ea5dc..ffc2a6328c 100644
--- a/ansible/roles/horizon/defaults/main.yml
+++ b/ansible/roles/horizon/defaults/main.yml
@@ -8,6 +8,7 @@ horizon_services:
enabled: true
image: "{{ horizon_image_full }}"
environment:
+ ENABLE_BLAZAR: "{{ 'yes' if enable_horizon_blazar | bool else 'no' }}"
ENABLE_CLOUDKITTY: "{{ 'yes' if enable_horizon_cloudkitty | bool else 'no' }}"
ENABLE_DESIGNATE: "{{ 'yes' if enable_horizon_designate | bool else 'no' }}"
ENABLE_FWAAS: "{{ 'yes' if enable_horizon_fwaas | bool else 'no' }}"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index d0a78c7a5b..7c0e7dac36 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -167,6 +167,7 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_haproxy: "yes"
#enable_heat: "yes"
#enable_horizon: "yes"
+#enable_horizon_blazar: "{{ enable_blazar | bool }}"
#enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}"
#enable_horizon_designate: "{{ enable_designate | bool }}"
#enable_horizon_freezer: "{{ enable_freezer | bool }}"
diff --git a/releasenotes/notes/add-blazar-dashboard-g6595d27c034f8xc.yaml b/releasenotes/notes/add-blazar-dashboard-g6595d27c034f8xc.yaml
new file mode 100644
index 0000000000..d84d416056
--- /dev/null
+++ b/releasenotes/notes/add-blazar-dashboard-g6595d27c034f8xc.yaml
@@ -0,0 +1,2 @@
+features:
+ - Add blazar-dashboard to horizon.