Skip to content

Commit faa8fcc

Browse files
committed
Synchronise configuration with master
Synchronised with kayobe @ 4d24fe7e97e6fb02185c0a2f1e44896718c4ac6c. Also synchronise CI jobs with most recent kayobe. Change-Id: Iafe63667512ffc60514538dad21bd3980faf453e Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
1 parent 88560a1 commit faa8fcc

File tree

7 files changed

+26
-16
lines changed

7 files changed

+26
-16
lines changed

etc/kayobe/bifrost.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
###############################################################################
55
# Bifrost installation.
66

7+
# Whether to install Bifrost. Default is true.
8+
#kolla_enable_bifrost:
9+
710
# URL of Bifrost source code repository.
811
#kolla_bifrost_source_url:
912

etc/kayobe/infra-vms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
3636
# when os_distribution is "rocky",
3737
# or
38-
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
38+
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
3939
# otherwise.
4040
#infra_vm_root_image:
4141

etc/kayobe/kolla.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@
284284

285285
#kolla_enable_aodh:
286286
#kolla_enable_barbican:
287+
#kolla_enable_bifrost:
287288
#kolla_enable_blazar:
288289
#kolla_enable_ceilometer:
289290
#kolla_enable_ceilometer_horizon_policy_file:

etc/kayobe/openstack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
###############################################################################
33
# OpenStack release configuration.
44

5-
# Name of the current OpenStack release. Default is "2025.1".
5+
# Name of the current OpenStack release. Default is "master".
66
#openstack_release:
77

8-
# Name of the current OpenStack branch. Default is "stable/2025.1".
8+
# Name of the current OpenStack branch. Default is "master".
99
#openstack_branch:
1010

1111
###############################################################################

etc/kayobe/seed-vm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
3636
# when os_distribution is "rocky",
3737
# or
38-
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
38+
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
3939
# otherwise.
4040
#seed_vm_root_image:
4141

etc/kayobe/seed.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@ seed_bootstrap_user: "{{ lookup('env', 'USER') }}"
9898
# Example:
9999
# seed_containers:
100100
# squid:
101-
# image: "stackhpc/squid:3.5.20-1"
101+
# image: "docker.io/stackhpc/squid"
102102
# pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
103103
# post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"
104+
# tag: "3.5.20-1"
104105
#
105106
#seed_containers:
106107

zuul.d/project.yaml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,38 @@
55
jobs:
66
- openstack-tox-pep8
77
- kayobe-overcloud-ubuntu-noble
8+
- kayobe-overcloud-ubuntu-noble-podman
89
- kayobe-overcloud-host-configure-rocky9
9-
- kayobe-overcloud-host-configure-centos9s
1010
- kayobe-overcloud-host-configure-ubuntu-noble
11-
- kayobe-overcloud-upgrade-ubuntu-jammy
11+
- kayobe-overcloud-upgrade-ubuntu-noble
1212
- kayobe-seed-rocky9
13+
- kayobe-seed-rocky9-podman
1314
- kayobe-seed-ubuntu-noble
14-
- kayobe-seed-images-rocky9
15+
- kayobe-seed-ubuntu-noble-podman
1516
- kayobe-seed-upgrade-rocky9
16-
- kayobe-seed-upgrade-ubuntu-jammy
17-
- kayobe-seed-vm-rocky9
18-
- kayobe-seed-vm-rocky9-efi
17+
- kayobe-seed-upgrade-ubuntu-noble
18+
- kayobe-seed-vm-rocky9:
19+
voting: false
20+
- kayobe-seed-vm-rocky9-efi:
21+
voting: false
1922
- kayobe-seed-vm-ubuntu-noble
2023
- kayobe-seed-vm-ubuntu-noble-efi
21-
- kayobe-infra-vm-rocky9
24+
- kayobe-infra-vm-rocky9:
25+
voting: false
2226
- kayobe-infra-vm-ubuntu-noble
2327
gate:
2428
jobs:
2529
- openstack-tox-pep8
2630
- kayobe-overcloud-ubuntu-noble
31+
- kayobe-overcloud-ubuntu-noble-podman
2732
- kayobe-overcloud-host-configure-rocky9
2833
- kayobe-overcloud-host-configure-ubuntu-noble
29-
- kayobe-overcloud-upgrade-ubuntu-jammy
34+
- kayobe-overcloud-upgrade-ubuntu-noble
3035
- kayobe-seed-rocky9
36+
- kayobe-seed-rocky9-podman
3137
- kayobe-seed-ubuntu-noble
38+
- kayobe-seed-ubuntu-noble-podman
3239
- kayobe-seed-upgrade-rocky9
33-
- kayobe-seed-upgrade-ubuntu-jammy
34-
- kayobe-seed-vm-rocky9
40+
- kayobe-seed-upgrade-ubuntu-noble
3541
- kayobe-seed-vm-ubuntu-noble
36-
- kayobe-infra-vm-rocky9
3742
- kayobe-infra-vm-ubuntu-noble

0 commit comments

Comments
 (0)