Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/multinode-inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def get_branch(version: str) -> str:


def get_tkm_version(version: str) -> str:
if version == "2025.1":
if version in ["2025.1", "2026.1"]:
return "main"
else:
return get_branch(version)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-multinode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
ssh_keys: ${{ needs.github_user_ssh_keys.outputs.ssh_keys }}
stackhpc_kayobe_config_version: ${{ github.ref_name }}
# NOTE(upgrade): Reference the PREVIOUS and CURRENT releases here.
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/2025.1' }}
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2025.1' || 'stackhpc/2026.1' }}
terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
terraform_kayobe_multinode_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'main' }}
multinode_controller_count: ${{ inputs.small_cluster && 1 || 3 }}
Expand Down
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/2025.1
- stackhpc/2026.1
jobs:
promote:
name: Trigger Pulp promotion workflows
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/stackhpc-update-kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- version: stackhpc/2023.1
- version: stackhpc/2024.1
- version: stackhpc/2025.1
- version: stackhpc/2026.1
uses: ./.github/workflows/update-dependencies.yml
with:
branch: ${{ matrix.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-overcloud-host-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Trigger overcloud host image build
on:
push:
branches:
- stackhpc/2025.1
- stackhpc/2026.1

jobs:
check-changes:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ on:
workflow_call:
inputs:
branch:
description: Branch to update. Must exist in all repositories. e.g. stackhpc/2025.1
description: Branch to update. Must exist in all repositories. e.g. stackhpc/2026.1
type: string
required: true
workflow_dispatch:
inputs:
branch:
description: Branch to update. Must exist in all repositories. e.g. stackhpc/2025.1
description: Branch to update. Must exist in all repositories. e.g. stackhpc/2026.1
type: string
required: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-overcloud-host-image-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
ref: stackhpc/2025.1
ref: stackhpc/2026.1
path: ${{ github.workspace }}/src/kayobe-config

- name: Update Rocky 9 overcloud host image tag
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
StackHPC Kayobe Configuration
=============================

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

**Note: This repository is maintained for StackHPC and its customers. While it
is not intended for direct external deployment, specific OpenStack
configuration elements may be extracted or adapted for your own use.**

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

Kayobe
Expand Down
5 changes: 1 addition & 4 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# TODO(priteau): Remove myst-parser dependency and bump Sphinx once
# compatibility is resolved
myst-parser>=4.0.0,<5 # MIT
reno>=3.4.0 # Apache-2.0
sphinx-copybutton # MIT
sphinx-substitution-extensions # MIT
sphinx>=4.2.0,<9 # BSD
sphinx>=8,<9 # BSD
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
sphinx-immaterial # MIT
6 changes: 3 additions & 3 deletions doc/source/contributor/environments/aio.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Download the setup script:

.. parsed-literal::

curl -LO https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/2025.1/etc/kayobe/environments/aio/automated-setup.sh
curl -LO https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/2026.1/etc/kayobe/environments/aio/automated-setup.sh

Change the permissions on the script:

Expand Down Expand Up @@ -62,9 +62,9 @@ following options:

* ``BASE_PATH`` (default: ``~``) - Directory to deploy from. The directory must
exist before running the script.
* ``KAYOBE_BRANCH`` (default: ``stackhpc/2025.1``) - The branch of Kayobe
* ``KAYOBE_BRANCH`` (default: ``stackhpc/2026.1``) - The branch of Kayobe
source code to use.
* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2025.1``) - The branch of
* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2026.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 etc/kayobe/environments/aio/automated-setup.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

BASE_PATH=~
OPENSTACK_RELEASE=2025.1
OPENSTACK_RELEASE=2026.1
KAYOBE_BRANCH=stackhpc/$OPENSTACK_RELEASE
KAYOBE_CONFIG_BRANCH=stackhpc/$OPENSTACK_RELEASE
KAYOBE_AIO_LVM=true
Expand Down
1 change: 0 additions & 1 deletion etc/kayobe/environments/aio/release-train.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ stackhpc_repo_mirror_password: "{{ stackhpc_release_pulp_password }}"
stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version }}"
stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version }}"
stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_10_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version }}"
stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version }}"
stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version }}"
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_docker_version }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
set -eu

BASE_PATH=~
KAYOBE_BRANCH=stackhpc/2025.1
KAYOBE_CONFIG_BRANCH=stackhpc/2025.1
KAYOBE_BRANCH=stackhpc/2026.1
KAYOBE_CONFIG_BRANCH=stackhpc/2026.1
KAYOBE_ENVIRONMENT=aufn-ceph

if [[ ! -f $BASE_PATH/vault-pw ]]; then
Expand Down
10 changes: 0 additions & 10 deletions etc/kayobe/environments/ci-builder/builder-apt-preferences

This file was deleted.

1 change: 0 additions & 1 deletion etc/kayobe/environments/ci-builder/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ stackhpc_repo_mirror_password: !vault |
stackhpc_repo_almalinux_10_proxysql_3_0_version: "{{ stackhpc_pulp_repo_almalinux_10_proxysql_3_0_version }}"
stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version }}"
stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_10_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version }}"
stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version }}"
stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version }}"
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_docker_version }}"
Expand Down
1 change: 0 additions & 1 deletion etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ stackhpc_repo_mirror_password: !vault |
stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version }}"
stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version }}"
stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_10_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version }}"
stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version }}"
stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version }}"
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_docker_version }}"
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/environments/ci-tenks/automated-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
set -eux

BASE_PATH=~
KAYOBE_BRANCH=stackhpc/2025.1
KAYOBE_CONFIG_REF=${KAYOBE_CONFIG_REF:-stackhpc/2025.1}
KAYOBE_BRANCH=stackhpc/2026.1
KAYOBE_CONFIG_REF=${KAYOBE_CONFIG_REF:-stackhpc/2026.1}
KAYOBE_ENVIRONMENT=${KAYOBE_ENVIRONMENT:-ci-tenks}

if [[ ! -f $BASE_PATH/vault-pw ]]; then
Expand Down
13 changes: 0 additions & 13 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ stackhpc_pulp_repo_rocky_10_security_aarch64_version: "{{ lookup('vars', 'stackh

# Rocky 10 Multiarch repositories
stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch' ~ arch_suffix ~ '_version') }}"
stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_openstack_epoxy' ~ arch_suffix ~ '_version') }}"
stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_ovn_lts' ~ arch_suffix ~ '_version') }}"
stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid' ~ arch_suffix ~ '_version') }}"
stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_docker' ~ arch_suffix ~ '_version') }}"
Expand Down Expand Up @@ -360,18 +359,6 @@ stackhpc_pulp_rpm_repos:
base_path: "centos/10-stream/nfv/aarch64/openvswitch-2/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"

- name: CentOS Stream 10 - OpenStack Epoxy
url: "{{ stackhpc_release_pulp_content_url }}/centos/10-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_version }}"
distribution_name: "centos-stream-10-openstack-epoxy-"
base_path: "centos/10-stream/cloud/x86_64/openstack-epoxy/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'x86_64' in stackhpc_pulp_rpm_architectures }}"

- name: CentOS Stream 10 - OpenStack Epoxy - aarch64
url: "{{ stackhpc_release_pulp_content_url }}/centos/10-stream/cloud/aarch64/openstack-epoxy/{{ stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_aarch64_version }}"
distribution_name: "centos-stream-10-openstack-epoxy-aarch64-"
base_path: "centos/10-stream/cloud/aarch64/openstack-epoxy/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"

- name: CentOS Stream 10 - Ceph Squid
url: "{{ stackhpc_release_pulp_content_url }}/centos/10-stream/storage/x86_64/ceph-squid/{{ stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version }}"
distribution_name: "centos-stream-10-ceph-squid-"
Expand Down
4 changes: 0 additions & 4 deletions etc/kayobe/stackhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,6 @@ stackhpc_repo_rocky_10_security_version: "{{ stackhpc_repo_distribution }}"
stackhpc_repo_centos_stream_10_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/10-stream/nfv/$basearch/openvswitch-2/{{ stackhpc_repo_centos_stream_10_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"

# CentOS Stream 10 - OVN/OVS LTS for Epoxy
stackhpc_repo_centos_stream_10_ovn_lts_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/10-stream/ovn/{{ kolla_base_arch }}/ovn-lts/{{ stackhpc_repo_centos_stream_10_ovn_lts_version }}"
stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_repo_distribution }}"

# CentOS Stream 10 - Ceph Squid
stackhpc_repo_centos_stream_10_storage_ceph_squid_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/10-stream/storage/$basearch/ceph-squid/{{ stackhpc_repo_centos_stream_10_storage_ceph_squid_version }}"
stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_repo_distribution }}"
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ commands =
allowlist_externals = rm
skip_install = true
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2025.1/upper-constraints.txt}
-c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2026.1/upper-constraints.txt}
-r{toxinidir}/releasenotes/requirements.txt
commands =
rm -rf releasenotes/build/html
Expand All @@ -30,7 +30,7 @@ commands =
allowlist_externals = rm
skip_install = true
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2025.1/upper-constraints.txt}
-c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2026.1/upper-constraints.txt}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html
Expand Down
Loading