From 6ec4e8a5c7ea0a9f6c6b8a9e40c429dd5efd3a81 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 12 Sep 2023 17:51:48 +0200
Subject: [PATCH] Complete Skydive removal and Skyline addition

Some mentions of skydive were forgotten in the original change [1].

[1] https://review.opendev.org/c/openstack/kayobe/+/884471.

Change-Id: If62fe0db3c107c52f80a481aa267335224456064
(cherry picked from commit 93ab685241c4bf6d38f7c6eb37ea9189aafdcb21)
---
 ansible/inventory/group_vars/all/kolla            | 8 ++++----
 ansible/roles/kolla-ansible/tests/test-extras.yml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla
index e34613f3f..afc2e8f0f 100644
--- a/ansible/inventory/group_vars/all/kolla
+++ b/ansible/inventory/group_vars/all/kolla
@@ -240,8 +240,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_sahara | bool }}"
   - regex: ^senlin
     enabled: "{{ kolla_enable_senlin | bool }}"
-  - regex: ^skydive
-    enabled: "{{ kolla_enable_skydive | bool }}"
+  - regex: ^skyline
+    enabled: "{{ kolla_enable_skyline | bool }}"
   - regex: ^solum
     enabled: "{{ kolla_enable_solum | bool }}"
   - regex: ^swift
@@ -552,7 +552,7 @@ kolla_enable_octavia: "no"
 kolla_enable_openvswitch: "{{ kolla_enable_neutron | bool }}"
 kolla_enable_ovn: "no"
 kolla_enable_ovs_dpdk: "no"
-kolla_enable_opensearch: "{{ kolla_enable_central_logging | bool or kolla_enable_osprofiler | bool or kolla_enable_skydive | bool }}"
+kolla_enable_opensearch: "{{ kolla_enable_central_logging | bool or kolla_enable_osprofiler | bool }}"
 kolla_enable_opensearch_dashboards: "{{ kolla_enable_opensearch | bool }}"
 kolla_enable_osprofiler: "no"
 kolla_enable_placement: "{{ kolla_enable_nova | bool or kolla_enable_zun | bool }}"
@@ -561,7 +561,7 @@ kolla_enable_qdrouterd: "no"
 kolla_enable_redis: "no"
 kolla_enable_sahara: "no"
 kolla_enable_senlin: "no"
-kolla_enable_skydive: "no"
+kolla_enable_skyline: "no"
 kolla_enable_solum: "no"
 kolla_enable_swift: "no"
 kolla_enable_tacker: "no"
diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml
index 32d5660d0..a737e6244 100644
--- a/ansible/roles/kolla-ansible/tests/test-extras.yml
+++ b/ansible/roles/kolla-ansible/tests/test-extras.yml
@@ -189,7 +189,7 @@
             kolla_enable_prometheus: True
             kolla_enable_sahara: True
             kolla_enable_senlin: True
-            kolla_enable_skydive: True
+            kolla_enable_skyline: True
             kolla_enable_solum: True
             kolla_enable_swift: True
             kolla_enable_tacker: True
@@ -310,7 +310,7 @@
               #enable_prometheus: True
               #enable_sahara: True
               #enable_senlin: True
-              #enable_skydive: True
+              #enable_skyline: True
               #enable_solum: True
               #enable_swift: True
               #enable_tacker: True