From 2e9b8dfc3a3cf2c9b72666cbb33fa4507bfdb6c1 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Fri, 22 Mar 2019 16:05:02 +0000
Subject: [PATCH] Add support for caso

(cherry picked from commit a78a8fdd3b7653d37effb2088bc8aa6e5ce23eaf)
(cherry picked from commit 5f57c8c9ac5c0d6a8cfe4a28fd30a5638eb61aa1)

Change-Id: I8804bd4647140bc837832a0cb6d8bbf3f8e53ac8
(cherry picked from commit 609f822c3f92625d56cdfff3aed2f793ad569fa6)
(cherry picked from commit 6862b1dd293c58f68b780c26b538a675244481f8)
---
 ansible/group_vars/all/kolla                                  | 3 +++
 ansible/roles/kolla-ansible/templates/overcloud-components.j2 | 3 +++
 ansible/roles/kolla-ansible/vars/main.yml                     | 1 +
 3 files changed, 7 insertions(+)

diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index dee9eceae..fff614a7e 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -120,6 +120,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_barbican | bool }}"
   - regex: blazar
     enabled: "{{ kolla_enable_blazar | bool }}"
+  - regex: caso
+    enabled: "{{ kolla_enable_caso | bool }}"
   - regex: ceilometer
     enabled: "{{ kolla_enable_ceilometer | bool }}"
   - regex: chrony
@@ -473,6 +475,7 @@ kolla_enable_rabbitmq: "yes"
 kolla_enable_aodh: "no"
 kolla_enable_barbican: "no"
 kolla_enable_blazar: "no"
+kolla_enable_caso: "no"
 kolla_enable_ceilometer: "no"
 kolla_enable_central_logging: "no"
 kolla_enable_chrony: "yes"
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index 75e9055ff..ec489924a 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -242,3 +242,6 @@ control
 
 [blazar:children]
 control
+
+[caso:children]
+monitoring
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index 01e0d951f..79edb0a55 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -75,6 +75,7 @@ kolla_feature_flags:
   - barbican
   - blazar
   - cadf_notifications
+  - caso
   - ceilometer
   - ceilometer_ipmi
   - cells