2023.1 RC1 - Sync KA feature flags & inventories

Preparations for Antelope RC1. Synchronises Kayobe with the Kolla-Ansible feature flags and inventory. Change-Id: I89a3fd800fafb29be27846806de4e6465209134c
2023-05-26 10:25:35 +01:00 · 2023-05-26 10:25:35 +01:00 · 0e984c4d47
commit 0e984c4d47
parent 7f4ba45191
4 changed files with 9 additions and 10 deletions
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@ -189,8 +189,8 @@ control
 [zun:children]
 control

-[skydive:children]
-monitoring
+[skyline:children]
+control

 [redis:children]
 control
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@ -450,13 +450,12 @@ compute
 [zun-cni-daemon:children]
 compute

-# Skydive
-[skydive-analyzer:children]
-skydive
+# Skyline
+[skyline-apiserver:children]
+skyline

-[skydive-agent:children]
-compute
-network
+[skyline-console:children]
+skyline

 # Tacker
 [tacker-server:children]
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@ -224,7 +224,7 @@ kolla_feature_flags:
  - redis
  - sahara
  - senlin
-  - skydive
+  - skyline
  - solum
  - swift
  - swift_recon
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@ -432,7 +432,7 @@
 #kolla_enable_redis:
 #kolla_enable_sahara:
 #kolla_enable_senlin:
-#kolla_enable_skydive:
+#kolla_enable_skyline:
 #kolla_enable_solum:
 #kolla_enable_swift:
 #kolla_enable_swift_recon: