bump refs for zed

Author: msherman64

.github/workflows/ciab_ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout chi-in-a-box
         uses: actions/checkout@v4

README.md

@@ -12,7 +12,7 @@ source $HOME/.local/bin/env
 ```
 git clone https://github.com/chameleoncloud/chi-in-a-box
 cd chi-in-a-box
-git checkout minimal/yoga-kvm
+git checkout minimal/zed-kvm
 ```
 
 ## install the ciab tools
@@ -21,7 +21,7 @@ uv venv .venv
 source .venv/bin/activate 
 uv pip install \
     -r requirements.txt \
-    git+https://github.com/chameleoncloud/kolla-ansible@backport/yoga
+    git+https://github.com/chameleoncloud/kolla-ansible@backport/zed
 kolla-ansible install-deps
 ```
 

requirements.txt

@@ -1,6 +1,5 @@
-# ansible version for kolla-ansible xena release
-# Kolla Ansible requires at least Ansible 2.10 and supports up to 4.
-ansible<5.0
+# Kolla Ansible requires at least Ansible 4 and supports up to 5.
+ansible>=4,<6
 # client tools
 openstackclient
 osc-lib

site-config/globals.yml

@@ -38,10 +38,10 @@ kolla_install_type: "source"
 docker_namespace: kolla
 docker_registry: docker.chameleoncloud.org
 
-keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:807524d
-keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:807524d
-keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:807524d
-horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:807524d
+keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:b61c66c
+keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:b61c66c
+keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:b61c66c
+horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:b61c66c
 
 # default superadmin user and project
 keystone_admin_user: "admin"

site-config/inventory/02-kolla-hosts

@@ -36,19 +36,13 @@ monitoring
 [kafka:children]
 control
 
-[kibana:children]
-control
-
 [telegraf:children]
 compute
 control
 monitoring
 network
 storage
 
-[elasticsearch:children]
-control
-
 [hacluster:children]
 control
 
@@ -67,9 +61,6 @@ control
 [outward-rabbitmq:children]
 control
 
-[qdrouterd:children]
-control
-
 [monasca-agent:children]
 compute
 control
@@ -200,6 +191,9 @@ control
 [blazar:children]
 control
 
+[venus:children]
+monitoring
+
 # Additional control implemented here. These groups allow you to control which
 # services run on which hosts at a per-service level.
 #
@@ -220,13 +214,13 @@ common
 [kolla-toolbox:children]
 common
 
-# Elasticsearch Curator
-[elasticsearch-curator:children]
-elasticsearch
-
 [opensearch:children]
 control
 
+# TODO: This is used for cleanup and can be removed in the Antelope cycle.
+[elasticsearch-curator:children]
+opensearch
+
 # Opensearch dashboards
 [opensearch-dashboards:children]
 opensearch
@@ -683,7 +677,6 @@ monitoring
 monitoring
 
 [prometheus-elasticsearch-exporter:children]
-elasticsearch
 opensearch
 
 [prometheus-blackbox-exporter:children]
@@ -728,3 +721,9 @@ ovn-database
 
 [ovn-sb-db:children]
 ovn-database
+
+[venus-api:children]
+venus
+
+[venus-manager:children]
+venus

site-config/passwords.yml.example

@@ -15,6 +15,8 @@ cinder_rbd_secret_uuid:
 database_password:
 # Password for the dedicated backup user account
 mariadb_backup_database_password:
+# Password for the monitor user
+mariadb_monitor_password:
 
 ####################
 # Docker options
@@ -115,10 +117,6 @@ murano_database_password:
 murano_keystone_password:
 murano_agent_rabbitmq_password:
 
-monasca_agent_password:
-monasca_database_password:
-monasca_keystone_password:
-
 ironic_database_password:
 ironic_keystone_password:
 
@@ -168,6 +166,9 @@ zun_keystone_password:
 vitrage_database_password:
 vitrage_keystone_password:
 
+venus_database_password:
+venus_keystone_password:
+
 masakari_database_password:
 masakari_keystone_password:
 
@@ -207,11 +208,6 @@ gnocchi_project_id:
 gnocchi_resource_id:
 gnocchi_user_id:
 
-####################
-# Qdrouterd options
-####################
-qdrouterd_password:
-
 ####################
 # RabbitMQ options
 ####################
@@ -227,11 +223,6 @@ outward_rabbitmq_cluster_cookie:
 haproxy_password:
 keepalived_password:
 
-####################
-# Kibana options
-####################
-kibana_password:
-
 ####################
 # etcd options
 ####################
@@ -263,6 +254,12 @@ ceph_rgw_keystone_password:
 ##################
 libvirt_sasl_password:
 
+############
+# ProxySQL
+############
+proxysql_admin_password:
+proxysql_stats_password:
+
 ############
 # OpenSearch
 ############

testing/setup_ciab.sh

@@ -29,7 +29,7 @@ uv venv .venv
 source .venv/bin/activate
 uv pip install \
     -r requirements.txt \
-    git+https://github.com/chameleoncloud/kolla-ansible@backport/yoga
+    git+https://github.com/chameleoncloud/kolla-ansible@backport/zed
 
 kolla-ansible install-deps