Merge pull request #199 from stackhpc/merge-upstream-master

Merge upstream master

Author: priteau

etc/kayobe/bifrost.yml

@@ -4,6 +4,9 @@
 ###############################################################################
 # Bifrost installation.
 
+# Whether to install Bifrost. Default is true.
+#kolla_enable_bifrost:
+
 # URL of Bifrost source code repository.
 #kolla_bifrost_source_url:
 

etc/kayobe/globals.yml

@@ -46,12 +46,15 @@
 
 # OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
 # is "rocky".
+# NOTE: Avoids using Ansible facts to be compatible with gather_facts: false
 os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
 # OS release. Valid options are "9-stream" when os_distribution is "centos", or
 # "9" when os_distribution is "rocky", or "noble" when os_distribution is
 # "ubuntu".
-#os_release:
+# NOTE: Avoids using Ansible facts to be compatible with gather_facts: false
+# yamllint disable-line rule:line-length
+os_release: "{{ 'noble' if os_distribution == 'ubuntu' else lookup('pipe', '. /etc/os-release && echo $VERSION_ID | cut -d . -f 1') | trim }}{{ '-stream' if os_distribution == 'centos' else '' }}"
 
 ###############################################################################
 # Ansible configuration.

etc/kayobe/infra-vms.yml

@@ -35,7 +35,7 @@
 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

etc/kayobe/kolla.yml

@@ -284,6 +284,7 @@
 
 #kolla_enable_aodh:
 #kolla_enable_barbican:
+#kolla_enable_bifrost:
 #kolla_enable_blazar:
 #kolla_enable_ceilometer:
 #kolla_enable_ceilometer_horizon_policy_file:

etc/kayobe/openstack.yml

@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "2025.1".
+# Name of the current OpenStack release. Default is "master".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/2025.1".
+# Name of the current OpenStack branch. Default is "master".
 #openstack_branch:
 
 ###############################################################################

etc/kayobe/seed-vm.yml

@@ -37,7 +37,7 @@ seed_vm_vcpus: 1
 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 

etc/kayobe/seed.yml

@@ -98,9 +98,10 @@
 # Example:
 # seed_containers:
 #   squid:
-#     image: "stackhpc/squid:3.5.20-1"
+#     image: "docker.io/stackhpc/squid"
 #     pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
 #     post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"
+#     tag: "3.5.20-1"
 #
 #seed_containers:
 

zuul.d/project.yaml

@@ -4,41 +4,39 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - kayobe-overcloud-rocky9
-        - kayobe-overcloud-centos9s
         - kayobe-overcloud-ubuntu-noble
-        - kayobe-overcloud-tls-rocky9
+        - kayobe-overcloud-ubuntu-noble-podman
         - kayobe-overcloud-host-configure-rocky9
-        - kayobe-overcloud-host-configure-centos9s
         - kayobe-overcloud-host-configure-ubuntu-noble
-        - kayobe-overcloud-upgrade-rocky9
-        - kayobe-overcloud-upgrade-ubuntu-jammy
+        - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-rocky9
+        - kayobe-seed-rocky9-podman
         - kayobe-seed-ubuntu-noble
-        - kayobe-seed-images-rocky9
+        - kayobe-seed-ubuntu-noble-podman
         - kayobe-seed-upgrade-rocky9
-        - kayobe-seed-upgrade-ubuntu-jammy
-        - kayobe-seed-vm-rocky9
-        - kayobe-seed-vm-rocky9-efi
+        - kayobe-seed-upgrade-ubuntu-noble
+        - kayobe-seed-vm-rocky9:
+            voting: false
+        - kayobe-seed-vm-rocky9-efi:
+            voting: false
         - kayobe-seed-vm-ubuntu-noble
         - kayobe-seed-vm-ubuntu-noble-efi
-        - kayobe-infra-vm-rocky9
+        - kayobe-infra-vm-rocky9:
+            voting: false
         - kayobe-infra-vm-ubuntu-noble
     gate:
       jobs:
         - openstack-tox-pep8
-        - kayobe-overcloud-rocky9
         - kayobe-overcloud-ubuntu-noble
-        - kayobe-overcloud-tls-rocky9
+        - kayobe-overcloud-ubuntu-noble-podman
         - kayobe-overcloud-host-configure-rocky9
         - kayobe-overcloud-host-configure-ubuntu-noble
-        - kayobe-overcloud-upgrade-rocky9
-        - kayobe-overcloud-upgrade-ubuntu-jammy
+        - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-rocky9
+        - kayobe-seed-rocky9-podman
         - kayobe-seed-ubuntu-noble
+        - kayobe-seed-ubuntu-noble-podman
         - kayobe-seed-upgrade-rocky9
-        - kayobe-seed-upgrade-ubuntu-jammy
-        - kayobe-seed-vm-rocky9
+        - kayobe-seed-upgrade-ubuntu-noble
         - kayobe-seed-vm-ubuntu-noble
-        - kayobe-infra-vm-rocky9
         - kayobe-infra-vm-ubuntu-noble