Skip to content

Commit 88a6397

Browse files
markgoddardmarkgoddard
authored
Merge pull request #1203 from stackhpc/caracal-aios
Add first tags for Caracal
2 parents 01f7e23 + 2fc9ae3 commit 88a6397

17 files changed

+79
-28
lines changed

‎.automation‎

‎.github/workflows/stackhpc-all-in-one.yml‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,28 @@ jobs:
264264
run: |
265265
docker image pull $KAYOBE_IMAGE
266266
267+
# Rocky 9 OVN deployments will fail when the hostname contains a '.'
268+
- name: Fix hostname
269+
run: |
270+
docker run -t --rm \
271+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
272+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
273+
${{ steps.kayobe_image.outputs.kayobe_image }} \
274+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/fix-hostname.yml
275+
env:
276+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
277+
278+
# Reboot to Apply hostname change
279+
- name: Reboot
280+
run: |
281+
docker run -t --rm \
282+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
283+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
284+
${{ steps.kayobe_image.outputs.kayobe_image }} \
285+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/reboot.yml -e reboot_with_bootstrap_user=true
286+
env:
287+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
288+
267289
- name: Run growroot
268290
run: |
269291
docker run -t --rm \
@@ -304,10 +326,29 @@ jobs:
304326
env:
305327
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
306328

329+
- name: Change rabbit queues from HA to Quorum
330+
run: |
331+
sed -i -e 's/om_enable_rabbitmq_high_availability: true/om_enable_rabbitmq_high_availability: false/' \
332+
-e 's/om_enable_rabbitmq_quorum_queues: false/om_enable_rabbitmq_quorum_queues: true/' \
333+
etc/kayobe/environments/ci-aio/kolla/globals.yml
334+
if: inputs.upgrade
335+
336+
- name: Migrate RabbitMQ queues
337+
run: |
338+
docker run -t --rm \
339+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
340+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
341+
${{ steps.kayobe_image.outputs.kayobe_image }} \
342+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/rabbitmq-quorum-migration.sh
343+
env:
344+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
345+
if: inputs.upgrade
346+
307347
# If testing upgrade, checkout the current release branch
308348
# Stash changes to tracked files, and set clean=false to avoid removing untracked files.
349+
# Revert changes to RabbitMQ Queue types to avoid a merge conflict
309350
- name: Stash config changes
310-
run: git stash
351+
run: git restore etc/kayobe/environments/ci-aio/kolla/globals.yml && git stash
311352
if: inputs.upgrade
312353

313354
- name: Checkout current release config

‎doc/source/conf.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@
122122
}
123123

124124
extlinks = {
125-
f"{project}-doc": (f"https://docs.openstack.org/{project}/{current_series}/", "%s documentation")
125+
f"{project}-doc": (f"https://docs.openstack.org/{project}/{current_series}/%s", "%s documentation")
126126
for project in extlinks_projects
127127
}
128-
extlinks["skc-doc"] = (f"https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-{current_series}/", "%s documentation")
129-
extlinks["kayobe-renos"] = (f"https://docs.openstack.org/releasenotes/kayobe/{current_series}.html", "%s release notes")
130-
extlinks["kolla-ansible-renos"] = (f"https://docs.openstack.org/releasenotes/kolla-ansible/{current_series}.html", "%s release notes")
131-
extlinks["ceph-doc"] = (f"https://docs.ceph.com/en/{ceph_series}/", "%s documentation")
128+
extlinks["skc-doc"] = (f"https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-{current_series}/%s", "%s documentation")
129+
extlinks["kayobe-renos"] = (f"https://docs.openstack.org/releasenotes/kayobe/{current_series}.html%s", "%s release notes")
130+
extlinks["kolla-ansible-renos"] = (f"https://docs.openstack.org/releasenotes/kolla-ansible/{current_series}.html%s", "%s release notes")
131+
extlinks["ceph-doc"] = (f"https://docs.ceph.com/en/{ceph_series}/%s", "%s documentation")

‎etc/kayobe/ansible/fix-hostname.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
- name: Fix hostname on storage nodes for cephadm
3-
hosts: storage
2+
- name: Ensure hostnames match inventory hostnames
3+
hosts: fix-hostname
44
gather_facts: false
55
vars:
66
ansible_user: "{{ bootstrap_user }}"

‎etc/kayobe/environments/ci-aio/inventory/groups‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
[container-image-builders:children]
44
# Build container images on the all-in-one controller.
55
controllers
6+
7+
[fix-hostname:children]
8+
controllers

‎etc/kayobe/environments/ci-multinode/inventory/groups‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
[container-image-builders:children]
44
# Build container images on the all-in-one controller.
55
controllers
6+
7+
[fix-hostname:children]
8+
storage

‎etc/kayobe/kolla-image-tags.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
# where the key is the OS distro and the value is the tag to deploy.
55
kolla_image_tags:
66
openstack:
7-
rocky-9: 2024.1-rocky-9-placeholder
8-
ubuntu-jammy: 2024.1-ubuntu-jammy-placeholder
7+
rocky-9: 2024.1-rocky-9-20240725T165045
8+
ubuntu-jammy: 2024.1-ubuntu-jammy-20240725T165045
9+
heat:
10+
rocky-9: 2024.1-rocky-9-20240805T142526
11+
ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526

‎etc/kayobe/kolla/globals.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ kolla_image_tags:
2222
# Variables defining which tag to use for each container's image.
2323
{{ lookup('pipe', 'python3 ' ~ kayobe_config_path ~ '/../../tools/kolla-images.py list-tag-vars') }}
2424

25-
#############################################################################
26-
# RabbitMQ
27-
28-
om_enable_rabbitmq_high_availability: true
29-
3025
#############################################################################
3126
# Monitoring and alerting related settings
3227

‎etc/kayobe/stackhpc.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,11 @@ stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}"
145145

146146
# Kolla Ansible source repository.
147147
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
148-
stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
148+
# FIXME: Waiting for
149+
# https://review.opendev.org/c/openstack/kolla-ansible/+/926198 to merge and
150+
# sync to stackhpc/2024.1
151+
# stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
152+
stackhpc_kolla_ansible_source_version: "fix-prometheus"
149153

150154
###############################################################################
151155
# Container image registry

‎releasenotes/config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
2-
# This needs to be updated to the latest release.
3-
release_tag_re: stackhpc/14\.\d+\.\d+\.\d
2+
# NOTE(upgrade): This needs to be updated to the current release's major version.
3+
release_tag_re: stackhpc/16\.\d+\.\d+\.\d
44
ignore_null_merges: false

0 commit comments

Comments
 (0)