Skip to content

Commit 677f1e2

Browse files
committed
Fix Prometheus build config
1 parent 98dde41 commit 677f1e2

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

etc/kayobe/kolla.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,6 @@ kolla_sources:
138138
type: git
139139
location: https://github.com/stackhpc/networking-generic-switch.git
140140
reference: stackhpc/{{ openstack_release }}
141-
prometheus-memcached-exporter:
142-
version: 0.14.4
143-
sha256:
144-
amd64: 60b0fb90e55937869e2a7aa1310d148d56a28639ca3373e0c50548ff8eebaaa1
145-
arm64: 053c6020bb2321d301bb1d43fbfc5aec64c3104a45a94338b4ca9351fc9ee014
146-
prometheus-v2-server:
147-
version: 2.53.1
148-
sha256:
149-
amd64: 2234aa0f66d9f9b854144f6faaaed72a316df7a680d9dad7cb48e49a6fa5332c
150-
arm64: a7f28c83c3c943b953a9d00860bd3f2422464fb7c27a3c4037ef1ce2a41592b5
151141

152142
###############################################################################
153143
# Kolla image build configuration.
@@ -403,7 +393,18 @@ kolla_build_customizations_ubuntu: {}
403393
kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_rocky if kolla_base_distro == 'rocky' else kolla_build_customizations_ubuntu) }}"
404394

405395
# Dict mapping Kolla Dockerfile ARG names to their values.
406-
kolla_build_args: {}
396+
kolla_build_args:
397+
prometheus_memcached_exporter_repository_version: |
398+
{% raw %}
399+
ARG memcached_exporter_version=0.14.4
400+
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
401+
{% endraw %}
402+
prometheus_v2_server_repository_version: |
403+
{% raw %}
404+
ARG prometheus_version=2.54.1
405+
ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz
406+
{% endraw %}
407+
407408
408409
###############################################################################
409410
# Kolla-ansible inventory configuration.

0 commit comments

Comments
 (0)