Merge branch 'stackhpc/2025.1' into epoxy_bump_capi_driver

Author: Alex-Welsh

.github/workflows/multinode-inputs.py

@@ -17,7 +17,6 @@ class OSRelease:
 @dataclass
 class OpenStackRelease:
     version: str
-    previous_version: str
     os_releases: t.List[OSRelease]
 
 
@@ -34,11 +33,12 @@ class Scenario:
 UBUNTU_NOBLE = OSRelease("ubuntu", "noble", "ubuntu")
 # NOTE(upgrade): Add supported releases here.
 OPENSTACK_RELEASES = [
-    OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
-    OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
-    OpenStackRelease("2025.1", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
+    OpenStackRelease("2023.1", [ROCKY_9, UBUNTU_JAMMY]),
+    OpenStackRelease("2024.1", [ROCKY_9, UBUNTU_JAMMY]),
+    OpenStackRelease("2025.1", [ROCKY_9, UBUNTU_NOBLE]),
 ]
 NEUTRON_PLUGINS = ["ovs", "ovn"]
+VERSION_HIERARCHY = ["zed", "2023.1", "2024.1", "2025.1"]
 
 
 def main() -> None:
@@ -52,13 +52,20 @@ def random_scenario() -> Scenario:
     openstack_release = random.choice(OPENSTACK_RELEASES)
     os_release = random.choice(openstack_release.os_releases)
     neutron_plugin = random.choice(NEUTRON_PLUGINS)
-    upgrade = 'major' if random.random() > 0.6 else 'none'
+    upgrade = "major" if random.random() > 0.6 else "none"
     return Scenario(openstack_release, os_release, neutron_plugin, upgrade)
 
 
 def generate_inputs(scenario: Scenario) -> t.Dict[str, str]:
     branch = get_branch(scenario.openstack_release.version)
-    previous_branch = get_branch(scenario.openstack_release.previous_version)
+    previous_branch = get_branch(
+        VERSION_HIERARCHY[
+            VERSION_HIERARCHY.index(scenario.openstack_release.version) - 1
+        ]
+    )
+    terraform_kayobe_multinode_version = get_tkm_version(
+        scenario.openstack_release.version
+    )
     inputs = {
         "os_distribution": scenario.os_release.distribution,
         "os_release": scenario.os_release.release,
@@ -67,6 +74,7 @@ def generate_inputs(scenario: Scenario) -> t.Dict[str, str]:
         "upgrade": scenario.upgrade,
         "stackhpc_kayobe_config_version": branch,
         "stackhpc_kayobe_config_previous_version": previous_branch,
+        "terraform_kayobe_multinode_version": terraform_kayobe_multinode_version,
     }
     return inputs
 
@@ -75,6 +83,13 @@ def get_branch(version: str) -> str:
     return f"stackhpc/{version}"
 
 
+def get_tkm_version(version: str) -> str:
+    if version in ["zed", "2023.1"]:
+        return "ea61ea1730e179e05e8f0e58b759267664c555e7"
+    else:
+        return "main"
+
+
 def write_output(name: str, value: str) -> None:
     print(f"{name}={value}")
 

.github/workflows/stackhpc-multinode-periodic.yml

@@ -19,6 +19,7 @@ jobs:
       upgrade: ${{ steps.generate-inputs.outputs.upgrade }}
       stackhpc_kayobe_config_version: ${{ steps.generate-inputs.outputs.stackhpc_kayobe_config_version }}
       stackhpc_kayobe_config_previous_version: ${{ steps.generate-inputs.outputs.stackhpc_kayobe_config_previous_version }}
+      terraform_kayobe_multinode_version: ${{ steps.generate-inputs.outputs.terraform_kayobe_multinode_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,6 +46,7 @@ jobs:
       upgrade: ${{ needs.generate-inputs.outputs.upgrade }}
       stackhpc_kayobe_config_version: ${{ needs.generate-inputs.outputs.stackhpc_kayobe_config_version }}
       stackhpc_kayobe_config_previous_version: ${{ needs.generate-inputs.outputs.stackhpc_kayobe_config_previous_version }}
+      terraform_kayobe_multinode_version: ${{ needs.generate-inputs.outputs.terraform_kayobe_multinode_version }}
       enable_slack_alert: true
     secrets: inherit
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'

etc/kayobe/kolla-image-tags.yml

@@ -6,6 +6,9 @@ kolla_image_tags:
   openstack:
     rocky-9: 2025.1-rocky-9-20250730T105631
     ubuntu-noble: 2025.1-ubuntu-noble-20250730T105631
+  keystone:
+    rocky-9: 2025.1-rocky-9-20250805T134044
+    ubuntu-noble: 2025.1-ubuntu-noble-20250805T134044
   magnum:
     rocky-9: 2025.1-rocky-9-20250805T095746
     ubuntu-noble: 2025.1-ubuntu-noble-20250805T095746

etc/kayobe/kolla.yml

@@ -135,6 +135,10 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
     reference: 1.3.0
+  keystone-base:
+    type: git
+    location: https://github.com/stackhpc/keystone.git
+    reference: stackhpc/{{ openstack_release }}
   magnum-base:
     type: git
     location: https://github.com/stackhpc/magnum.git

etc/kayobe/stackhpc.yml

@@ -149,11 +149,11 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
-stackhpc_kolla_source_version: stackhpc/20.1.0.6
+stackhpc_kolla_source_version: stackhpc/20.1.0.7
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.5
+stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.6
 
 ###############################################################################
 # Container image registry

requirements.txt

@@ -1,4 +1,4 @@
-kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/18.1.0.6
+kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/18.1.0.7
 ansible-modules-hashivault>=5.3.0
 pulp-glue<0.32,>=0.29.2
 jmespath