Skip to content

Commit 663cf42

Browse files
markgoddardmarkgoddard
committed
WIP: Repo and Kolla image updates
1 parent 9647b55 commit 663cf42

File tree

3 files changed

+39
-102
lines changed

3 files changed

+39
-102
lines changed

‎etc/kayobe/kolla.yml

Lines changed: 19 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ kolla_sources:
134134
type: git
135135
location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
136136
reference: 1.3.0
137-
# Not yet merged: https://github.com/stackhpc/magnum/pull/139
138137
magnum-base:
139138
type: git
140139
location: https://github.com/stackhpc/magnum.git
@@ -147,6 +146,16 @@ kolla_sources:
147146
type: git
148147
location: https://github.com/stackhpc/networking-generic-switch.git
149148
reference: stackhpc/{{ openstack_release }}
149+
prometheus-memcached-exporter:
150+
version: 0.14.4
151+
sha256:
152+
amd64: 60b0fb90e55937869e2a7aa1310d148d56a28639ca3373e0c50548ff8eebaaa1
153+
arm64: 053c6020bb2321d301bb1d43fbfc5aec64c3104a45a94338b4ca9351fc9ee014
154+
prometheus-v2-server:
155+
version: 2.53.1
156+
sha256:
157+
amd64: 2234aa0f66d9f9b854144f6faaaed72a316df7a680d9dad7cb48e49a6fa5332c
158+
arm64: a7f28c83c3c943b953a9d00860bd3f2422464fb7c27a3c4037ef1ce2a41592b5
150159

151160
###############################################################################
152161
# Kolla image build configuration.
@@ -168,9 +177,9 @@ stackhpc_rocky_9_additional_repos:
168177
- url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
169178
file: "CentOS-NFV-OpenvSwitch.repo"
170179
tag: "centos-nfv-openvswitch"
171-
- url: "{{ stackhpc_repo_centos_stream_9_openstack_antelope_url }}"
172-
file: "CentOS-OpenStack-antelope.repo"
173-
tag: "centos-openstack-antelope"
180+
- url: "{{ stackhpc_repo_centos_stream_9_openstack_caracal_url }}"
181+
file: "CentOS-OpenStack-caracal.repo"
182+
tag: "centos-openstack-caracal"
174183
- url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
175184
file: "CentOS-OpsTools.repo"
176185
tag: "centos-opstools"
@@ -186,18 +195,18 @@ stackhpc_rocky_9_third_party_repos:
186195
- url: "{{ stackhpc_repo_grafana_url }}"
187196
file: "grafana.repo"
188197
tag: "grafana"
189-
- url: "{{ stackhpc_repo_rhel_9_treasuredata_4_url }}"
198+
- url: "{{ stackhpc_repo_rhel_9_treasuredata_lts_5_url }}"
190199
file: "td.repo"
191200
tag: "treasuredata"
192-
- url: "{{ stackhpc_repo_rhel_9_mariadb_10_6_url }}"
201+
- url: "{{ stackhpc_repo_rhel_9_mariadb_10_11_url }}"
193202
file: "mariadb.repo"
194203
tag: "mariadb"
195204
- url: "{{ stackhpc_repo_rhel_9_influxdb_url }}"
196205
file: "influxdb.repo"
197206
tag: "influxdb"
198-
- url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_quincy_url }}"
199-
file: "CentOS-Ceph-Quincy.repo"
200-
tag: "centos-ceph-quincy"
207+
- url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_reef_url }}"
208+
file: "CentOS-Ceph-Reef.repo"
209+
tag: "centos-ceph-reef"
201210
- url: "{{ stackhpc_repo_rabbitmq_erlang_url }}"
202211
file: "rabbitmq_rabbitmq-erlang.repo"
203212
tag: "rabbitmq_rabbitmq-erlang"
@@ -339,86 +348,6 @@ kolla_build_blocks:
339348
{% set magnum_capi_packages = ['magnum-capi-helm==1.0.0'] %}
340349
RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
341350
{% endraw %}
342-
prometheus_alertmanager_repository_version: | # 2023.1 kolla has 0.24.0
343-
{% raw %}
344-
ARG prometheus_alertmanager_version=0.26.0
345-
ARG prometheus_alertmanager_archive=alertmanager-${prometheus_alertmanager_version}.linux-{{debian_arch}}.tar.gz
346-
ARG prometheus_alertmanager_sha256sums_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/sha256sums.txt
347-
ARG prometheus_alertmanager_download_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/${prometheus_alertmanager_archive}
348-
{% endraw %}
349-
prometheus_blackbox_exporter_repository_version: | # 2023.1 kolla has 0.23.0
350-
{% raw %}
351-
ARG blackbox_exporter_version=0.25.0
352-
ARG blackbox_exporter_url=https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz
353-
{% endraw %}
354-
prometheus_cadvisor_repository_version: | # 2023.1 kolla has 0.48.0
355-
{% raw %}
356-
ARG prometheus_cadvisor_version=0.49.1
357-
{% if debian_arch == 'arm64' %}
358-
ARG prometheus_cadvisor_sha256sum=c535f46d789599f25c7c680af193d4402da27a98d9828eb2ec916af6256e0c0c
359-
{% else %}
360-
ARG prometheus_cadvisor_sha256sum=1d5cc701a3fcdf1e8ed1c86da5304b896a6997d9e6673139e78a6f87812495b0
361-
{% endif %}
362-
ARG prometheus_cadvisor_url=https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor-v${prometheus_cadvisor_version}-linux-{{debian_arch}}
363-
{% endraw %}
364-
haproxy_exporter_repository_version: | # 2023.1 kolla has 0.13.0
365-
{% raw %}
366-
ARG haproxy_exporter_version=0.15.0
367-
ARG haproxy_exporter_url=https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz
368-
{% endraw %}
369-
prometheus_memcached_exporter_repository_version: | # 2023.1 kolla has 0.10.0
370-
{% raw %}
371-
ARG memcached_exporter_version=0.14.3
372-
ARG memcached_exporter_url=https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-{{debian_arch}}.tar.gz
373-
{% endraw %}
374-
prometheus_msteams_repository_version: | # 2023.1 kolla has 1.5.1
375-
{% raw %}
376-
ARG prometheus_msteams_version=1.5.2
377-
ARG prometheus_msteams_sha256sum=0f4df9ee31e655d1ec876ea2c53ab5ae5b07143ef21b9190e61b4d52839e135c
378-
ARG prometheus_msteams_url=https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}}
379-
{% endraw %}
380-
prometheus_mtail_version: | # 2023.1 kolla has 3.0.0-rc50
381-
{% raw %}
382-
ARG prometheus_mtail_version=3.0.0-rc53
383-
ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/v${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_{{debian_arch}}.tar.gz
384-
{% endraw %}
385-
mysqld_exporter_repository_version: | # 2023.1 kolla has 0.15.0
386-
{% raw %}
387-
ARG mysqld_exporter_version=0.15.1
388-
ARG mysqld_exporter_url=https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-{{debian_arch}}.tar.gz
389-
{% endraw %}
390-
node_exporter_repository_version: | # 2023.1 kolla has 1.4.0
391-
{% raw %}
392-
ARG node_exporter_version=1.7.0
393-
{% if debian_arch == 'arm64' %}
394-
ARG node_exporter_sha256sum=e386c7b53bc130eaf5e74da28efc6b444857b77df8070537be52678aefd34d96
395-
{% else %}
396-
ARG node_exporter_sha256sum=a550cd5c05f760b7934a2d0afad66d2e92e681482f5f57a917465b1fba3b02a6
397-
{% endif %}
398-
ARG node_exporter_url=https://github.com/prometheus/node_exporter/releases/download/v{$node_exporter_version}/node_exporter-${node_exporter_version}.linux-{{debian_arch}}.tar.gz
399-
{% endraw %}
400-
prometheus_openstack_exporter_repository_version: | # 2023.1 kolla has 1.6.0
401-
{% raw %}
402-
ARG prometheus_openstack_exporter_version=1.7.0
403-
ARG prometheus_openstack_exporter_url=https://github.com/openstack-exporter/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter_${prometheus_openstack_exporter_version}_linux_{{debian_arch}}.tar.gz
404-
{% endraw %}
405-
prometheus_ovn_exporter_repository_version: | # 2023.1 kolla has 1.0.6
406-
{% raw %}
407-
{% if base_arch == 'x86_64' %}
408-
ARG ovn_arch=amd64
409-
{% elif base_arch == 'aarch64' %}
410-
ARG ovn_arch=arm64
411-
{% endif %}
412-
ARG prometheus_ovn_version=1.0.7
413-
ARG prometheus_ovn_cksum_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/checksums.txt
414-
ARG ovn_exporter_tgz=ovn-exporter_${prometheus_ovn_version}_linux_${ovn_arch}.tar.gz
415-
ARG prometheus_ovn_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/${ovn_exporter_tgz}
416-
{% endraw %}
417-
prometheus_v2_server_repository_version: | # 2023.1 kolla has 2.38.0
418-
{% raw %}
419-
ARG prometheus_version=2.51.1
420-
ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz
421-
{% endraw %}
422351
423352
# Dict mapping image customization variable names to their values.
424353
# Each variable takes the form:
@@ -433,6 +362,7 @@ kolla_build_customizations_common:
433362
- /additions/*
434363

435364
kolla_build_customizations_rocky:
365+
# TODO: bump
436366
ovn_base_packages_override:
437367
- ovn23.03
438368
ovn_controller_packages_override:

‎etc/kayobe/pulp.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,16 @@ stackhpc_pulp_rpm_repos:
237237
base_path: "grafana/oss/rpm/"
238238
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
239239

240-
- name: RabbitMQ - Erlang
241-
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
242-
distribution_name: "rabbitmq-erlang-"
243-
base_path: "rabbitmq/erlang/el/8/x86_64/"
240+
- name: RabbitMQ - Erlang - RHEL 9
241+
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
242+
distribution_name: "rhel9-rabbitmq-erlang-"
243+
base_path: "rabbitmq/erlang/el/9/x86_64/"
244244
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
245245

246-
- name: RabbitMQ - Server
247-
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
248-
distribution_name: "rabbitmq-server-"
249-
base_path: "rabbitmq/rabbitmq-server/el/8/x86_64/"
246+
- name: RabbitMQ - Server - RHEL 9
247+
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
248+
distribution_name: "rhel9-rabbitmq-server-"
249+
base_path: "rabbitmq/rabbitmq-server/el/9/x86_64/"
250250
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
251251

252252
# Base Rocky 9 repositories
@@ -293,11 +293,10 @@ stackhpc_pulp_rpm_repos:
293293
base_path: "centos/9-stream/nfv/x86_64/openvswitch-2/"
294294
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
295295

296-
297-
- name: CentOS Stream 9 - OpenStack Antelope
298-
url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-antelope/{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
299-
distribution_name: "centos-stream-9-openstack-antelope-"
300-
base_path: "centos/9-stream/cloud/x86_64/openstack-antelope/"
296+
- name: CentOS Stream 9 - OpenStack Caracal
297+
url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-caracal/{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
298+
distribution_name: "centos-stream-9-openstack-caracal-"
299+
base_path: "centos/9-stream/cloud/x86_64/openstack-caracal/"
301300
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
302301

303302
- name: CentOS 9 - OpsTools - collectd
@@ -336,12 +335,14 @@ stackhpc_pulp_rpm_repos:
336335
required: "{{ stackhpc_pulp_sync_el_9 | bool }}"
337336

338337
# Additional RHEL 9 repositories
338+
# FIXME: TD5
339339
- name: TreasureData 4 for RHEL 9
340340
url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/4/redhat/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
341341
distribution_name: "rhel-9-treasuredata-4-"
342342
base_path: "treasuredata/4/redhat/9/x86_64/"
343343
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
344344

345+
# FIXME: Mariadb 10.11
345346
- name: MariaDB 10.6 for RHEL 9
346347
url: "{{ stackhpc_release_pulp_content_url }}/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
347348
distribution_name: "rhel-9-mariadb-10-6-"

‎etc/kayobe/stackhpc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_repo_distribution }}"
5656
stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/oss/rpm/{{ stackhpc_repo_grafana_version }}"
5757
stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
5858

59+
# FIXME: RHEL9
5960
# RabbitMQ - Erlang for Redhat family, version 8/9 agnostic
6061
stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
6162
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
6263

64+
# FIXME: RHEL9
6365
# RabbitMQ for Redhat family, version 8/9 agnostic
6466
stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_repo_rabbitmq_server_version }}"
6567
stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
@@ -68,6 +70,7 @@ stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
6870
stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
6971
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
7072

73+
# FIXME: Caracal
7174
# CentOS Stream 9 - OpenStack Antelope
7275
stackhpc_repo_centos_stream_9_openstack_antelope_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-antelope/{{ stackhpc_repo_centos_stream_9_openstack_antelope_version }}"
7376
stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_repo_distribution }}"
@@ -76,6 +79,7 @@ stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_repo_dist
7679
stackhpc_repo_centos_stream_9_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_9_opstools_version }}"
7780
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_repo_distribution }}"
7881

82+
# FIXME: Reef
7983
# CentOS Stream 9 - Ceph Quincy
8084
stackhpc_repo_centos_stream_9_storage_ceph_quincy_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/storage/x86_64/ceph-quincy/{{ stackhpc_repo_centos_stream_9_storage_ceph_quincy_version }}"
8185
stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_repo_distribution }}"
@@ -84,10 +88,12 @@ stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_repo_dis
8488
stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/docker-ce/centos/9/x86_64/stable/{{ stackhpc_repo_centos_stream_9_docker_version }}"
8589
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_repo_distribution }}"
8690

91+
# FIXME: TD5
8792
# TreasureData 4 for RHEL 9
8893
stackhpc_repo_rhel_9_treasuredata_4_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/4/redhat/9/x86_64/{{ stackhpc_repo_rhel_9_treasuredata_4_version }}"
8994
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_repo_distribution }}"
9095

96+
# FIXME: 10.11
9197
# MariaDB 10.6 for RHEL 9
9298
stackhpc_repo_rhel_9_mariadb_10_6_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_repo_rhel_9_mariadb_10_6_version }}"
9399
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_repo_distribution }}"

0 commit comments

Comments
 (0)