From 12cdd90633fdb20bb4cd5e6cf732a7a3f01d78bd Mon Sep 17 00:00:00 2001
From: chenxing <chason.chan@foxmail.com>
Date: Fri, 29 Dec 2017 18:11:52 +0800
Subject: [PATCH] Enable vitrage dashboard

Depends-On: I5846b48d336583ae82743f61bfbdadc99c755e8d
Change-Id: Iaf15dad5e4d527b8721409e56fc081043c1cb174
Implements: blueprint vitrage-roles
---
 README.rst                                | 1 +
 ansible/group_vars/all.yml                | 1 +
 ansible/roles/horizon/defaults/main.yml   | 1 +
 ansible/roles/vitrage/tasks/bootstrap.yml | 1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 528413eab9..cfbfb40b82 100644
--- a/README.rst
+++ b/README.rst
@@ -75,6 +75,7 @@ Kolla-Ansible deploys containers for the following OpenStack projects:
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Tempest <https://docs.openstack.org/tempest/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
+- `Vitrage <https://docs.openstack.org/vitrage/latest/>`__
 - `Vmtp <https://vmtp.readthedocs.io/en/latest/>`__
 - `Watcher <https://docs.openstack.org/watcher/latest/>`__
 - `Zun <https://docs.openstack.org/zun/latest/>`__
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index cbcd18b096..8b2e0edecd 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -413,6 +413,7 @@ enable_horizon_senlin: "{{ enable_senlin | bool }}"
 enable_horizon_solum: "{{ enable_solum | bool }}"
 enable_horizon_tacker: "{{ enable_tacker | bool }}"
 enable_horizon_trove: "{{ enable_trove | bool }}"
+enable_horizon_vitrage: "{{ enable_vitrage | bool }}"
 enable_horizon_watcher: "{{ enable_watcher | bool }}"
 enable_horizon_zun: "{{ enable_zun | bool }}"
 enable_hyperv: "no"
diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
index b3a6c8e74f..e79332b2f8 100644
--- a/ansible/roles/horizon/defaults/main.yml
+++ b/ansible/roles/horizon/defaults/main.yml
@@ -26,6 +26,7 @@ horizon_services:
       ENABLE_SOLUM: "{{ 'yes' if enable_horizon_solum | bool else 'no' }}"
       ENABLE_TACKER: "{{ 'yes' if enable_horizon_tacker | bool else 'no' }}"
       ENABLE_TROVE: "{{ 'yes' if enable_horizon_trove | bool else 'no' }}"
+      ENABLE_VITRAGE: "{{ 'yes' if enable_horizon_vitrage | bool else 'no' }}"
       ENABLE_WATCHER: "{{ 'yes' if enable_horizon_watcher | bool else 'no' }}"
       ENABLE_ZUN: "{{ 'yes' if enable_horizon_zun | bool else 'no' }}"
       FORCE_GENERATE: "{{ 'yes' if horizon_dev_mode | bool else 'no' }}"
diff --git a/ansible/roles/vitrage/tasks/bootstrap.yml b/ansible/roles/vitrage/tasks/bootstrap.yml
index cbe16a1ba3..aa267e1d07 100644
--- a/ansible/roles/vitrage/tasks/bootstrap.yml
+++ b/ansible/roles/vitrage/tasks/bootstrap.yml
@@ -30,4 +30,3 @@
 
 - include: bootstrap_service.yml
   when: database.changed
-