Skip to content

Commit 04c19ee

Browse files
Alex-WelshAlex-Welsh
authored
Merge branch 'stackhpc/2025.1' into update-dependency/kolla-ansible/stackhpc/2025.1
2 parents ee70b2d + 8dd8ea7 commit 04c19ee

File tree

8 files changed

+95
-95
lines changed

8 files changed

+95
-95
lines changed

‎.github/workflows/stackhpc-pull-request.yml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -219,21 +219,20 @@ jobs:
219219
secrets: inherit
220220
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
221221

222-
# FIXME: Disabled until https://bugs.launchpad.net/neutron/+bug/2112492 gets resolved
223-
# all-in-one-upgrade-rocky-9-ovs:
224-
# name: aio upgrade (Rocky 9 OVS)
225-
# needs:
226-
# - check-changes
227-
# - build-kayobe-image
228-
# uses: ./.github/workflows/stackhpc-all-in-one.yml
229-
# with:
230-
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
231-
# os_distribution: rocky
232-
# os_release: "9"
233-
# ssh_username: cloud-user
234-
# neutron_plugin: ovs
235-
# OS_CLOUD: openstack
236-
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
237-
# upgrade: true
238-
# secrets: inherit
239-
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
222+
all-in-one-upgrade-rocky-9-ovs:
223+
name: aio upgrade (Rocky 9 OVS)
224+
needs:
225+
- check-changes
226+
- build-kayobe-image
227+
uses: ./.github/workflows/stackhpc-all-in-one.yml
228+
with:
229+
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
230+
os_distribution: rocky
231+
os_release: "9"
232+
ssh_username: cloud-user
233+
neutron_plugin: ovs
234+
OS_CLOUD: openstack
235+
if: ${{ needs.check-changes.outputs.aio == 'true' }}
236+
upgrade: true
237+
secrets: inherit
238+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

‎doc/source/operations/upgrading-openstack.rst‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,39 @@ the following in ``kayobe-config/etc/kayobe/stackhpc-monitoring.yml``:
132132
# targets being templated during deployment.
133133
stackhpc_enable_os_capacity: false
134134
135+
Prometheus blackbox exporter endpoints
136+
--------------------------------------
137+
138+
Many endpoints for the Blackbox exporter are now templated in the Kolla-Ansible
139+
group vars for the cloud. This means that the
140+
``prometheus_blackbox_exporter_endpoints`` variable can be removed from the
141+
environment's ``kolla/globals.yml`` file (if applicable) and the endpoints will
142+
fallback to the ones templated in the group vars. Backend endpoints such as
143+
`these <https://github.com/stackhpc/stackhpc-kayobe-config/blob/094c2e012a037309d103c08a71eb633fdeb214e7/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter#L27-L64>`__
144+
are not yet templated by Kolla-Ansible.
145+
146+
Additional endpoints may still be added.
147+
148+
For Kolla-Ansible templating, use ``stackhpc_prometheus_blackbox_exporter_endpoints_custom``.
149+
For example:
150+
151+
.. code-block:: yaml
152+
:caption: ``etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter``
153+
154+
stackhpc_prometheus_blackbox_exporter_endpoints_custom:
155+
- 'custom_service:http_2xx:{{ public_protocol }}://{{ external_fqdn | put_address_in_context('url') }}:{{ custom_serivce_port }}'
156+
157+
Alternatively, for Kayobe templating, use the ``prometheus_blackbox_exporter_endpoints_kayobe`` variable.
158+
For example:
159+
160+
.. code-block:: yaml
161+
:caption: ``kolla/globals.yml``
162+
163+
prometheus_blackbox_exporter_endpoints_kayobe:
164+
- endpoints:
165+
- "pulp:http_2xx:{{ pulp_url }}/pulp/api/v3/status/"
166+
enabled: "{{ seed_pulp_container_enabled | bool }}"
167+
135168
Known issues
136169
============
137170

‎etc/kayobe/ansible/pulp-artifact-upload.yml‎

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@
2828
- urllib3
2929
state: present
3030

31-
- name: Upload an artifact
32-
pulp.squeezer.artifact:
33-
pulp_url: "{{ remote_pulp_url }}"
34-
username: "{{ remote_pulp_username }}"
35-
password: "{{ remote_pulp_password }}"
36-
file: "{{ found_files.files[0].path }}"
37-
state: present
38-
register: upload_result
39-
until: upload_result is success
40-
retries: 3
41-
delay: 60
42-
4331
- name: Get sha256 hash
4432
ansible.builtin.stat:
4533
path: "{{ found_files.files[0].path }}"
@@ -58,87 +46,49 @@
5846
checksum_algorithm: sha256
5947
register: checksum_stats
6048

61-
- name: Upload checksum artifact
62-
pulp.squeezer.artifact:
49+
- name: Ensure file repo exists
50+
pulp.squeezer.file_repository:
6351
pulp_url: "{{ remote_pulp_url }}"
6452
username: "{{ remote_pulp_username }}"
6553
password: "{{ remote_pulp_password }}"
66-
file: "/tmp/{{ found_files.files[0].path | basename }}.sha256"
54+
name: "{{ repository_name }}"
6755
state: present
68-
register: checksum_upload_result
69-
until: checksum_upload_result is success
56+
register: file_repo_result
57+
until: file_repo_result is success
7058
retries: 3
71-
delay: 60
72-
when: upload_checksum
59+
delay: 5
7360

74-
- name: Create file content from artifact
61+
- name: Upload artifact
7562
pulp.squeezer.file_content:
7663
pulp_url: "{{ remote_pulp_url }}"
7764
username: "{{ remote_pulp_username }}"
7865
password: "{{ remote_pulp_password }}"
66+
file: "{{ found_files.files[0].path }}"
7967
sha256: "{{ file_stats.stat.checksum }}"
8068
relative_path: "{{ found_files.files[0].path | basename }}"
8169
state: present
70+
repository: "{{ repository_name }}"
8271
register: file_content_result
8372
until: file_content_result is success
8473
retries: 3
8574
delay: 5
8675

87-
- name: Create checksum content from artifact
76+
- name: Upload checksum
8877
pulp.squeezer.file_content:
8978
pulp_url: "{{ remote_pulp_url }}"
9079
username: "{{ remote_pulp_username }}"
9180
password: "{{ remote_pulp_password }}"
81+
file: "/tmp/{{ found_files.files[0].path | basename }}.sha256"
9282
sha256: "{{ checksum_stats.stat.checksum }}"
9383
relative_path: "{{ found_files.files[0].path | basename }}.sha256"
9484
state: present
85+
repository: "{{ repository_name }}"
9586
register: checksum_content_result
9687
until: checksum_content_result is success
9788
retries: 3
9889
delay: 5
9990
when: upload_checksum
10091

101-
- name: Ensure file repo exists
102-
pulp.squeezer.file_repository:
103-
pulp_url: "{{ remote_pulp_url }}"
104-
username: "{{ remote_pulp_username }}"
105-
password: "{{ remote_pulp_password }}"
106-
name: "{{ repository_name }}"
107-
state: present
108-
register: file_repo_result
109-
until: file_repo_result is success
110-
retries: 3
111-
delay: 5
112-
113-
- name: Add content to file repo
114-
pulp.squeezer.file_repository_content:
115-
pulp_url: "{{ remote_pulp_url }}"
116-
username: "{{ remote_pulp_username }}"
117-
password: "{{ remote_pulp_password }}"
118-
repository: "{{ repository_name }}"
119-
present_content:
120-
- relative_path: "{{ found_files.files[0].path | basename }}"
121-
sha256: "{{ file_stats.stat.checksum }}"
122-
register: file_repo_content_result
123-
until: file_repo_content_result is success
124-
retries: 3
125-
delay: 5
126-
127-
- name: Add checksum content to file repo
128-
pulp.squeezer.file_repository_content:
129-
pulp_url: "{{ remote_pulp_url }}"
130-
username: "{{ remote_pulp_username }}"
131-
password: "{{ remote_pulp_password }}"
132-
repository: "{{ repository_name }}"
133-
present_content:
134-
- relative_path: "{{ found_files.files[0].path | basename }}.sha256"
135-
sha256: "{{ checksum_stats.stat.checksum }}"
136-
register: checksum_repo_content_result
137-
until: checksum_repo_content_result is success
138-
retries: 3
139-
delay: 5
140-
when: upload_checksum
141-
14292
- name: Create a new publication to point to this version
14393
pulp.squeezer.file_publication:
14494
pulp_url: "{{ remote_pulp_url }}"

‎etc/kayobe/ansible/requirements.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
---
22
collections:
33
- name: stackhpc.cephadm
4-
version: 1.19.1
5-
# NOTE: Pinning pulp.squeezer to 0.0.13 because 0.0.14+ depends on the
6-
# pulp_glue Python library being installed.
4+
version: 1.19.3
75
- name: pulp.squeezer
8-
version: 0.0.13
6+
version: 0.1.1
97
- name: stackhpc.pulp
108
version: 0.5.5
119
- name: stackhpc.hashicorp
@@ -15,19 +13,20 @@ collections:
1513
roles:
1614
- src: stackhpc.vxlan
1715
version: 1.1.0
18-
- name: ansible-lockdown.ubuntu22_cis
19-
src: https://github.com/ansible-lockdown/UBUNTU22-CIS
20-
version: 1.4.1
16+
- name: ansible-lockdown.ubuntu24_cis
17+
src: https://github.com/ansible-lockdown/UBUNTU24-CIS
18+
version: 1.0.1
2119
- name: ansible-lockdown.rhel9_cis
2220
src: https://github.com/ansible-lockdown/RHEL9-CIS
23-
version: 1.3.1
21+
version: v1.3.4
2422
- name: wazuh-ansible
2523
src: https://github.com/stackhpc/wazuh-ansible
2624
version: stackhpc-v4.10.0
2725
- name: geerlingguy.pip
28-
version: 2.2.0
26+
version: 3.1.0
2927
- name: monolithprojects.github_actions_runner
30-
version: 1.18.5
31-
- src: https://github.com/stackhpc/ansible-role-docker.git
32-
name: geerlingguy.docker
28+
src: https://github.com/MonolithProjects/ansible-github_actions_runner
29+
version: 1.25.1
30+
- name: geerlingguy.docker
31+
src: https://github.com/stackhpc/ansible-role-docker.git
3332
version: stackhpc/7.0.1.1

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ kolla_image_tags:
66
openstack:
77
rocky-9: 2025.1-rocky-9-20250616T133037
88
ubuntu-noble: 2025.1-ubuntu-noble-20250613T131221
9+
neutron_metadata_agent:
10+
rocky-9: 2025.1-rocky-9-20250626T074649
11+
ubuntu-noble: 2025.1-ubuntu-noble-20250626T074649

‎etc/kayobe/stackhpc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
141141

142142
# Kolla source repository.
143143
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
144-
stackhpc_kolla_source_version: stackhpc/20.0.0.12
144+
stackhpc_kolla_source_version: stackhpc/20.0.0.14
145145

146146
# Kolla Ansible source repository.
147147
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
@@ -178,4 +178,4 @@ stackhpc_enable_kolla_ansible_check: true
178178
download_amphora_from_ark: true
179179

180180
# Octavia Amphora image version
181-
stackhpc_amphora_image_version: "TODO"
181+
stackhpc_amphora_image_version: "2025.1-20250619T113933"

‎releasenotes/notes/ansible-requirements-bump-89313038efba83b3.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
features:
3+
- |
4+
Ansible dependencies have been bumped to the latest available
5+
versions. This includes:
6+
7+
* ``stackhpc.cephadm`` - ``1.19.1`` -> ``1.19.3``
8+
* ``pulp.squeezer`` - ``0.0.13`` -> ``0.1.1``
9+
* ``ansible-lockdown.rhel9_cis`` - ``1.3.1`` -> ``v1.3.4``
10+
* ``geerlingguy.pip`` - ``2.2.0`` -> ``3.1.0``
11+
* ``monolithprojects.github_actions_runner`` - ``1.18.5`` -> ``1.25.1``
12+
* ``geerlingguy.docker`` - unpinned -> ``stackhpc/7.0.1.1``
13+
* ``ansible-modules-hashivault`` - ``5.2.1`` -> ``5.3.0``
14+
15+
``ansible-lockdown.ubuntu22_cis`` has been replaced with
16+
``ansible-lockdown.ubuntu24_cis``, which is pinned to ``1.0.1``.

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/18.0.0.0rc1.2
2-
ansible-modules-hashivault>=5.2.1
2+
ansible-modules-hashivault>=5.3.0
33
jmespath

0 commit comments

Comments
 (0)