Merge pull request #173 from stackhpc/upstream/2023.1-2023-09-18

Synchronise 2023.1 with upstream
stackhpc · Sep 18, 2023 · f209ccb · f209ccb
2 parents 57ed051 + 6ec4e8a
commit f209ccb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla
@@ -242,8 +242,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
@@ -555,7 +555,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 }}"
@@ -564,7 +564,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
@@ -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