From 257468d910e37a14a182250d8dae7a3b3038e388 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)
(cherry picked from commit 2e9b8dfc3a3cf2c9b72666cbb33fa4507bfdb6c1)
(cherry picked from commit 219ed0bc2df928f731858deca0ea67383fafc8e0)
---
 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 5eeb81a48..6059e886d 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -122,6 +122,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
@@ -525,6 +527,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: "no"
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index c0487a462..fc1f24270 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -229,3 +229,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 796cf49e2..c68baf7b4 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -74,6 +74,7 @@ kolla_feature_flags:
   - aodh
   - barbican
   - blazar
+  - caso
   - ceilometer
   - ceilometer_horizon_policy_file
   - ceilometer_ipmi