From 4f44c88528017b564b39953dc252fdb5365efac0 Mon Sep 17 00:00:00 2001
From: Dawud M <dawud@stackhpc.com>
Date: Thu, 10 Nov 2022 10:20:53 +0000
Subject: [PATCH] Remove Venus support

In the stable/yoga branch of kolla-ansible Venus has been removed,
hence removing Venus support in Kayobe.
See: https://review.opendev.org/c/openstack/kolla-ansible/+/841232

Change-Id: I227c2a4fc8cec20a0e64a7f3fb4d26911aacd857
---
 .../roles/kolla-ansible/templates/overcloud-components.j2   | 3 ---
 ansible/roles/kolla-ansible/templates/overcloud-services.j2 | 6 ------
 ansible/roles/kolla-ansible/vars/main.yml                   | 1 -
 etc/kayobe/kolla.yml                                        | 1 -
 4 files changed, 11 deletions(-)

diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index c879fba4f..b5382a365 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -206,6 +206,3 @@ control
 
 [blazar:children]
 control
-
-[venus:children]
-monitoring
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 3897b9bde..a740490a4 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -553,9 +553,3 @@ ovn-database
 
 [ovn-sb-db:children]
 ovn-database
-
-[venus-api:children]
-venus
-
-[venus-manager:children]
-venus
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index 30a76b5c0..a330319ac 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -227,7 +227,6 @@ kolla_feature_flags:
   - telegraf
   - trove
   - trove_singletenant
-  - venus
   - vitrage
   - vitrage_prometheus_datasource
   - watcher
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 816397e3f..34d5f7840 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -417,7 +417,6 @@
 #kolla_enable_telegraf:
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
-#kolla_enable_venus:
 #kolla_enable_vitrage:
 #kolla_enable_vitrage_prometheus_datasource:
 #kolla_enable_watcher: