Skip to content

2025.1 init #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
May 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
85049b1
Bump kolla to stackhpc/18.6.0.8
stackhpc-ci May 6, 2025
6a6ba1f
Merge branch 'stackhpc/2024.1' into update-dependency/kolla/stackhpc/…
Alex-Welsh May 7, 2025
c786f88
Merge branch 'stackhpc/2024.1' into update-dependency/kolla/stackhpc/…
Alex-Welsh May 9, 2025
027eea0
Fix Neutron endpoint used in Octavia OVN provider
priteau May 9, 2025
681169d
Fix whitespace issues
Alex-Welsh May 9, 2025
4b9eed0
Merge pull request #1635 from stackhpc/update-dependency/kolla/stackh…
Alex-Welsh May 9, 2025
e4ce7a9
Merge pull request #1638 from stackhpc/ovn-octavia-provider-caracal
Alex-Welsh May 9, 2025
a068f1b
Merge pull request #1639 from stackhpc/whitespace
Alex-Welsh May 9, 2025
b4fe805
fix: add missing `openbao` distribution
jackhodgkiss May 9, 2025
4834cf6
Merge pull request #1640 from stackhpc/fix-missing-openbao-distro
jackhodgkiss May 9, 2025
9202db2
Kolla-Ansible/Kayobe version enforcement (#1551)
assumptionsandg May 12, 2025
39e7e8a
CI: Remove Ubuntu OVS, add RL9 OVS upgrade cases
Alex-Welsh May 12, 2025
d8b266f
Fix duplicate metrics from radosgw_usage_exporter
MoteHue May 12, 2025
76c76c9
Merge pull request #1642 from stackhpc/fix-radosgw-usage-exporter-dup…
MoteHue May 12, 2025
a6f6de6
Bump kolla-ansible to stackhpc/18.6.0.9
stackhpc-ci May 13, 2025
e530be8
Bump kolla to stackhpc/18.6.0.9
stackhpc-ci May 13, 2025
3712a4b
Merge pull request #1641 from stackhpc/ubuntu-ovs-2024.1
Alex-Welsh May 13, 2025
fbb4acc
Merge branch 'stackhpc/2024.1' into update-dependency/kolla-ansible/s…
Alex-Welsh May 13, 2025
63635a5
Merge branch 'stackhpc/2024.1' into update-dependency/kolla/stackhpc/…
Alex-Welsh May 13, 2025
58fd699
Merge pull request #1644 from stackhpc/update-dependency/kolla-ansibl…
Alex-Welsh May 13, 2025
6e720be
Merge pull request #1645 from stackhpc/update-dependency/kolla/stackh…
Alex-Welsh May 13, 2025
f67c1ab
Merge remote-tracking branch 'origin/stackhpc/master' into 2025.1-init
Alex-Welsh May 14, 2025
f62009a
Merge branch 'stackhpc/2025.1' into 2025.1-init
Alex-Welsh May 21, 2025
9e17e32
Pin kolla/kolla-ansible to specific versions
Alex-Welsh May 21, 2025
3fe6412
Temporarily disable AIO jobs to save resources
Alex-Welsh May 21, 2025
c39363f
Remove fixme comments for fixed lines
Alex-Welsh May 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .ansible-lint-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ etc/kayobe/ansible/vault-generate-internal-tls.yml fqcn[action-core]
etc/kayobe/ansible/vault-generate-test-external-tls.yml fqcn[action-core]
etc/kayobe/ansible/rabbitmq-reset.yml command-instead-of-module
etc/kayobe/ansible/ubuntu-upgrade.yml syntax-check[missing-file]
etc/kayobe/ansible/check-kayobe-version.yml command-instead-of-module
etc/kayobe/ansible/check-kolla-ansible-version.yml command-instead-of-module
2 changes: 1 addition & 1 deletion .automation
2 changes: 1 addition & 1 deletion .github/workflows/multinode-inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Scenario:
OPENSTACK_RELEASES = [
OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
OpenStackRelease("master", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
OpenStackRelease("2025.1", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
]
NEUTRON_PLUGINS = ["ovs", "ovn"]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runner-selector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- name: Set output for container image build runner
run: echo "Setting runner for ${{ inputs.runner_env }} -> ${{ vars.RUNS_ON_TARGET_CONTAINER_IMAGE_BUILDER }}"

- id: container-image-build-runner
run: echo "runner_name_container_image_build=${{ vars.RUNS_ON_TARGET_CONTAINER_IMAGE_BUILDER }}" >> $GITHUB_OUTPUT

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-build-kayobe-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
push:
branches:
# NOTE(upgrade): Reference only the current release branch here.
- stackhpc/master
- stackhpc/2025.1

workflow_call:
inputs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stackhpc-multinode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
break_duration: ${{ fromJSON(inputs.break_duration) }}
ssh_key: ${{ inputs.ssh_key }}
stackhpc_kayobe_config_version: ${{ github.ref_name }}
# NOTE(upgrade): Reference the PREVIOUS release here.
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/master' }}
# NOTE(upgrade): Reference the PREVIOUS and CURRENT releases here.
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/2025.1' }}
terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
# NOTE(upgrade): Reference only the current release branch here.
- stackhpc/master
- stackhpc/2025.1
jobs:
promote:
name: Trigger Pulp promotion workflows
Expand Down
221 changes: 111 additions & 110 deletions .github/workflows/stackhpc-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,100 +109,29 @@ jobs:
# when the parent jobs completed successfully or were skipped. We pass an
# 'if' argument to the called workflow to allow running it conditionally.

build-kayobe-image:
name: Build Kayobe Image
needs:
- check-changes
uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
with:
if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
# build-kayobe-image:
# name: Build Kayobe Image
# needs:
# - check-changes
# uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
# with:
# if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
# if: github.repository == 'stackhpc/stackhpc-kayobe-config'

check-tags:
name: Check container image tags
needs:
- check-changes
- build-kayobe-image
uses: ./.github/workflows/stackhpc-check-tags.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
secrets: inherit
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

all-in-one-ubuntu-noble-ovs:
name: aio (Ubuntu Noble OVS)
needs:
- check-changes
- build-kayobe-image
uses: ./.github/workflows/stackhpc-all-in-one.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
os_distribution: ubuntu
os_release: noble
ssh_username: ubuntu
neutron_plugin: ovs
OS_CLOUD: openstack
if: ${{ needs.check-changes.outputs.aio == 'true' }}
secrets: inherit
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

all-in-one-ubuntu-noble-ovn:
name: aio (Ubuntu Noble OVN)
needs:
- check-changes
- build-kayobe-image
uses: ./.github/workflows/stackhpc-all-in-one.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
os_distribution: ubuntu
os_release: noble
ssh_username: ubuntu
neutron_plugin: ovn
OS_CLOUD: openstack
if: ${{ needs.check-changes.outputs.aio == 'true' }}
secrets: inherit
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

all-in-one-rocky-9-ovs:
name: aio (Rocky 9 OVS)
needs:
- check-changes
- build-kayobe-image
uses: ./.github/workflows/stackhpc-all-in-one.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
os_distribution: rocky
os_release: "9"
ssh_username: cloud-user
neutron_plugin: ovs
OS_CLOUD: openstack
if: ${{ needs.check-changes.outputs.aio == 'true' }}
secrets: inherit
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

all-in-one-rocky-9-ovn:
name: aio (Rocky 9 OVN)
needs:
- check-changes
- build-kayobe-image
uses: ./.github/workflows/stackhpc-all-in-one.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
os_distribution: rocky
os_release: "9"
ssh_username: cloud-user
neutron_plugin: ovn
OS_CLOUD: openstack
if: ${{ needs.check-changes.outputs.aio == 'true' }}
secrets: inherit
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

# Test two upgrade scenarios: Ubuntu Noble OVS and Rocky 9 OVN.

# On hold until Noble support lands in stackhpc/2024.1
# all-in-one-upgrade-ubuntu-noble-ovs:
# name: aio upgrade (Ubuntu Noble OVS)
# check-tags:
# name: Check container image tags
# needs:
# - check-changes
# - build-kayobe-image
# uses: ./.github/workflows/stackhpc-check-tags.yml
# with:
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
# if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
# secrets: inherit
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

# all-in-one-ubuntu-noble-ovn:
# name: aio (Ubuntu Noble OVN)
# needs:
# - check-changes
# - build-kayobe-image
Expand All @@ -212,27 +141,99 @@ jobs:
# os_distribution: ubuntu
# os_release: noble
# ssh_username: ubuntu
# neutron_plugin: ovn
# OS_CLOUD: openstack
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
# secrets: inherit
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

# all-in-one-rocky-9-ovs:
# name: aio (Rocky 9 OVS)
# needs:
# - check-changes
# - build-kayobe-image
# uses: ./.github/workflows/stackhpc-all-in-one.yml
# with:
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
# os_distribution: rocky
# os_release: "9"
# ssh_username: cloud-user
# neutron_plugin: ovs
# OS_CLOUD: openstack
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
# secrets: inherit
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

# all-in-one-rocky-9-ovn:
# name: aio (Rocky 9 OVN)
# needs:
# - check-changes
# - build-kayobe-image
# uses: ./.github/workflows/stackhpc-all-in-one.yml
# with:
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
# os_distribution: rocky
# os_release: "9"
# ssh_username: cloud-user
# neutron_plugin: ovn
# OS_CLOUD: openstack
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
# secrets: inherit
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

# # Test two upgrade scenarios: Ubuntu Noble OVS and Rocky 9 OVN.

# # On hold until Noble support lands in stackhpc/2024.1
# # all-in-one-upgrade-ubuntu-noble-ovs:
# # name: aio upgrade (Ubuntu Noble OVS)
# # needs:
# # - check-changes
# # - build-kayobe-image
# # uses: ./.github/workflows/stackhpc-all-in-one.yml
# # with:
# # kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
# # os_distribution: ubuntu
# # os_release: noble
# # ssh_username: ubuntu
# # neutron_plugin: ovs
# # OS_CLOUD: openstack
# # if: ${{ needs.check-changes.outputs.aio == 'true' }}
# # upgrade: true
# # secrets: inherit
# # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

# all-in-one-upgrade-rocky-9-ovn:
# name: aio upgrade (Rocky 9 OVN)
# needs:
# - check-changes
# - build-kayobe-image
# uses: ./.github/workflows/stackhpc-all-in-one.yml
# with:
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
# os_distribution: rocky
# os_release: "9"
# ssh_username: cloud-user
# neutron_plugin: ovn
# OS_CLOUD: openstack
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
# upgrade: true
# secrets: inherit
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

all-in-one-upgrade-rocky-9-ovn:
name: aio upgrade (Rocky 9 OVN)
needs:
- check-changes
- build-kayobe-image
uses: ./.github/workflows/stackhpc-all-in-one.yml
with:
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
os_distribution: rocky
os_release: "9"
ssh_username: cloud-user
neutron_plugin: ovn
OS_CLOUD: openstack
if: ${{ needs.check-changes.outputs.aio == 'true' }}
upgrade: true
secrets: inherit
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
# all-in-one-upgrade-rocky-9-ovs:
# name: aio upgrade (Rocky 9 OVS)
# needs:
# - check-changes
# - build-kayobe-image
# uses: ./.github/workflows/stackhpc-all-in-one.yml
# with:
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
# os_distribution: rocky
# os_release: "9"
# ssh_username: cloud-user
# neutron_plugin: ovs
# OS_CLOUD: openstack
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
# upgrade: true
# secrets: inherit
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
4 changes: 2 additions & 2 deletions .github/workflows/stackhpc-update-kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
codename: Antelope
- version: stackhpc/2024.1
codename: Caracal
- version: stackhpc/master
codename: master
- version: stackhpc/2025.1
codename: Epoxy
uses: ./.github/workflows/update-dependencies.yml
with:
openstack_version: ${{ matrix.version }}
Expand Down
2 changes: 1 addition & 1 deletion .gitreview
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
host=review.opendev.org
port=29418
project=openstack/kayobe-config.git
defaultbranch=master
defaultbranch=stable/2025.1
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build:
python: "3.12"
jobs:
post_checkout:
- git remote set-branches origin master stackhpc/master stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
- git remote set-branches origin master stackhpc/master stackhpc/2025.1 stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
- git fetch --unshallow

# Build documentation in the doc/source/ directory with Sphinx
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
StackHPC Kayobe Configuration
=============================

This repository provides a base Kayobe configuration for the Master release
of StackHPC OpenStack.
This repository provides a base Kayobe configuration for the 2025.1 Epoxy
release of StackHPC OpenStack.

Documentation is hosted on `readthedocs.io
<https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-master/index.html>`__,
<https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-2025.1/index.html>`__,
and includes release notes.

Kayobe
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# -- StackHPC Kayobe configuration --------------------------------------
# Variables to override

current_series = "master"
current_series = "2025.1"
previous_series = "2024.1"
branch = f"stackhpc/{current_series}"
ceph_series = "squid"
Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/environments/aufn-ceph.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
.. warning::

This guide was written for the Yoga release and has not been validated for
Master. Proceed with caution.
2025.1. Proceed with caution.

Prerequisites
=============
Expand Down
6 changes: 3 additions & 3 deletions doc/source/contributor/environments/ci-aio.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Download the setup script:

.. parsed-literal::

wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/master/etc/kayobe/environments/ci-aio/automated-setup.sh
wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/2025.1/etc/kayobe/environments/ci-aio/automated-setup.sh

Change the permissions on the script:

Expand All @@ -52,9 +52,9 @@ following options:

* ``BASE_PATH`` (default: ``~``) - Directory to deploy from. The directory must
exist before running the script.
* ``KAYOBE_BRANCH`` (default: ``stackhpc/master``) - The branch of Kayobe
* ``KAYOBE_BRANCH`` (default: ``stackhpc/2025.1``) - The branch of Kayobe
source code to use.
* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/master``) - The branch of
* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2025.1``) - The branch of
``stackhpc-kayobe-config`` to use.
* ``KAYOBE_AIO_LVM`` (default: ``true``) - Whether the image uses LVM.
* ``KAYOBE_CONFIG_EDIT_PAUSE`` (default: ``false``) - Option to pause
Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/environments/ci-multinode.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Multinode Test Environment
.. warning::

This guide was written for the Yoga release and has not been validated for
Master. Proceed with caution.
2025.1. Proceed with caution.

The ``ci-multinode`` environment provides a Kayobe configuration for multi-node
clouds to be used for test and development purposes. It is designed to be used
Expand Down
Loading
Loading