Skip to content

Commit 6a0a061

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/fully-qualified-seed-image-names' into fully-qualified-seed-image-names
2 parents f990836 + e8ba336 commit 6a0a061

11 files changed

Lines changed: 283 additions & 45 deletions

File tree

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
# This workflow builds required versions of OVN and OVS for
3+
# Rocky Linux 10 then pushes them to a registry.
4+
5+
# This will only be needed until we move to newer OVN/OVS
6+
# packages, which already exist in the NFV SIG repository for
7+
# CentOS Stream 10.
8+
9+
name: Build Rocky 10 OVN/OVS Packages
10+
on: workflow_dispatch
11+
12+
jobs:
13+
run-away:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Print message and run away
17+
run: echo "This workflow is not operational yet"

doc/source/operations/upgrading-openstack.rst

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ From Dalmatian, `Kayobe no longer provides its own default driver & interfaces
196196
for Ironic and follows Ironic's default.
197197
This can cause your Ironic configuration ``ironic.conf`` to regress.
198198
Check the configuration difference before applying and re-add your options at
199-
``$KAYOBE_CONFIG_PATH/kolla/ironic.conf``
200-
(``$KAYOBE_CONFIG_PATH/environments/<env>/kolla/ironic.conf`` if using environments)
199+
``$KAYOBE_CONFIG_PATH/kolla/config/ironic.conf``
200+
(``$KAYOBE_CONFIG_PATH/environments/<env>/kolla/config/ironic.conf`` if using environments)
201201

202202
For example,
203203

@@ -566,6 +566,19 @@ To upgrade the Ansible control host:
566566
567567
kayobe control host upgrade
568568
569+
Upgrading Pulp
570+
--------------
571+
572+
The local Pulp server needs to be upgraded before synchronising 2025.1
573+
container images. The following command will deploy the latest Pulp container
574+
without upgrading Bifrost:
575+
576+
.. code-block:: console
577+
578+
kayobe seed service deploy --kolla-tags none --tags seed-manage-containers
579+
580+
Note that this will also update any other enabled seed containers, such as Squid.
581+
569582
Syncing Release Train artifacts
570583
-------------------------------
571584

etc/kayobe/ansible/deployment/get-nvme-drives.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
- name: Retrieve NVMe device information via smartctl
1818
ansible.builtin.command: "smartctl -i -j {{ item }}"
1919
register: smartctl_info
20-
loop: "{{ nvme_devices }}"
20+
loop: "{{ nvme_devices | default([], true) }}"
2121
loop_control:
2222
label: "{{ item }}"
2323
changed_when: false
2424
become: true
25-
when: nvme_devices | length > 0
2625

2726
- name: Parse NVMe device model names
2827
ansible.builtin.set_fact:

etc/kayobe/kolla.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,11 @@ kolla_enable_prometheus: true
844844

845845
# Extra items to add to kolla_openstack_custom_config_rules_default
846846
# to produce kolla_openstack_custom_config_rules.
847-
#kolla_openstack_custom_config_rules_extra:
847+
kolla_openstack_custom_config_rules_extra:
848+
# Files ending with .example should not be copied
849+
- glob: "**/*.example"
850+
strategy: noop
851+
priority: 1
848852

849853
###############################################################################
850854
# Passwords and credentials.

etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ route:
1818
receivers:
1919
- name: 'msteamsv2-notifications'
2020
msteamsv2_configs:
21-
- webhook_url: '{{ secrets_msteams_notification_channel_url | default('https://prod-01.westeurope.logic.azure.com/workflows/') }}'
21+
- webhook_url: '{{ secrets_msteams_notification_channel_url | ansible.builtin.mandatory(msg="secrets_msteams_notification_channel_url is undefined. Please add this variable to secrets.yml when using the Microsoft Teams Alertmanager integration.") }}'
2222
send_resolved: true
2323
- name: 'msteamsv2-critical-notifications'
2424
msteamsv2_configs:
25-
- webhook_url: '{{ secrets_msteams_notification_critical_channel_url | default('https://prod-01.westeurope.logic.azure.com/workflows/') }}'
25+
- webhook_url: '{{ secrets_msteams_notification_critical_channel_url | ansible.builtin.mandatory(msg="secrets_msteams_notification_critical_channel_url is undefined. Please add this variable to secrets.yml when using the Microsoft Teams Alertmanager integration.") }}'
2626
send_resolved: true
2727

2828
templates:

etc/kayobe/pulp-repo-versions.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
# This file is autogenerated by Ansible using the following workflow:
33
# https://github.com/stackhpc/stackhpc-release-train/actions/workflows/package-update-kayobe.yml
44
stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version: 20250627T134211
5+
stackhpc_pulp_repo_centos_stream_10_docker_aarch64_version: 20260220T152827
6+
stackhpc_pulp_repo_centos_stream_10_docker_version: 20260220T152827
7+
stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_aarch64_version: 20260220T152827
8+
stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_version: 20260220T152827
9+
stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_aarch64_version: 20260227T222400
10+
stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_version: 20260227T214730
11+
stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_aarch64_version: 20260220T152827
12+
stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version: 20260220T152827
513
stackhpc_pulp_repo_centos_stream_9_docker_aarch64_version: 20260202T213000
614
stackhpc_pulp_repo_centos_stream_9_docker_version: 20260202T201529
715
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_aarch64_version: 20260202T213000
@@ -18,11 +26,17 @@ stackhpc_pulp_repo_doca_2_9_1_rhel9_5_modules_version: 20250115T150314
1826
stackhpc_pulp_repo_doca_2_9_1_rhel9_5_version: 20241211T171301
1927
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_modules_version: 20250714T141841
2028
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version: 20250703T135021
29+
stackhpc_pulp_repo_doca_3_2_1_rhel10_aarch64_version: 20260220T152827
30+
stackhpc_pulp_repo_doca_3_2_1_rhel10_x86_64_version: 20260220T152827
2131
stackhpc_pulp_repo_doca_3_2_1_rhel9_7_modules_version: 20251222T160623
2232
stackhpc_pulp_repo_doca_3_2_1_rhel9_version: 20251219T132023
2333
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260204T212153
34+
stackhpc_pulp_repo_elrepo_10_aarch64_version: 20260220T152827
35+
stackhpc_pulp_repo_elrepo_10_version: 20260220T152827
2436
stackhpc_pulp_repo_elrepo_9_aarch64_version: 20250408T030629
2537
stackhpc_pulp_repo_elrepo_9_version: 20260127T212055
38+
stackhpc_pulp_repo_epel_10_aarch64_version: 20260222T221647
39+
stackhpc_pulp_repo_epel_10_version: 20260221T212353
2640
stackhpc_pulp_repo_epel_9_aarch64_version: 20260204T223146
2741
stackhpc_pulp_repo_epel_9_version: 20260204T220346
2842
stackhpc_pulp_repo_grafana_version: 20260214T213531
@@ -32,12 +46,29 @@ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20260112T224827
3246
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20260112T224827
3347
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20251130T213625
3448
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20260122T202504
49+
stackhpc_pulp_repo_rhel_10_mariadb_10_11_aarch64_version: 20260220T152827
50+
stackhpc_pulp_repo_rhel_10_mariadb_10_11_version: 20260220T152827
3551
stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20260112T224827
3652
stackhpc_pulp_repo_rhel_9_influxdb_version: 20260113T202459
3753
stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20260204T223146
3854
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20260204T213517
3955
stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20251219T213344
4056
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20251219T202129
57+
stackhpc_pulp_repo_rocky_10_1_appstream_aarch64_version: 20260221T224249
58+
stackhpc_pulp_repo_rocky_10_1_appstream_source_version: 20260221T221101
59+
stackhpc_pulp_repo_rocky_10_1_appstream_version: 20260221T220006
60+
stackhpc_pulp_repo_rocky_10_1_baseos_aarch64_version: 20260221T224249
61+
stackhpc_pulp_repo_rocky_10_1_baseos_source_version: 20260221T221101
62+
stackhpc_pulp_repo_rocky_10_1_baseos_version: 20260221T222543
63+
stackhpc_pulp_repo_rocky_10_1_crb_aarch64_version: 20260221T224249
64+
stackhpc_pulp_repo_rocky_10_1_crb_source_version: 20260220T120402
65+
stackhpc_pulp_repo_rocky_10_1_crb_version: 20260221T220006
66+
stackhpc_pulp_repo_rocky_10_1_extras_aarch64_version: 20260220T120402
67+
stackhpc_pulp_repo_rocky_10_1_extras_source_version: 20260220T120402
68+
stackhpc_pulp_repo_rocky_10_1_extras_version: 20260220T120402
69+
stackhpc_pulp_repo_rocky_10_1_highavailability_aarch64_version: 20260220T120402
70+
stackhpc_pulp_repo_rocky_10_1_highavailability_source_version: 20260220T120402
71+
stackhpc_pulp_repo_rocky_10_1_highavailability_version: 20260220T120402
4172
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
4273
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
4374
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328

0 commit comments

Comments
 (0)