Skip to content

Commit 859b6d2

Browse files
committed
Use kolla_build_black instread for prometheus version
1 parent 34e439f commit 859b6d2

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

etc/kayobe/kolla.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,16 @@ kolla_build_blocks:
329329
{% set magnum_capi_packages = ['magnum-capi-helm==1.1.0'] %}
330330
RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
331331
{% endraw %}
332+
prometheus_memcached_exporter_repository_version: |
333+
{% raw %}
334+
ARG memcached_exporter_version=0.14.4
335+
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
336+
{% endraw %}
337+
prometheus_v2_server_repository_version: |
338+
{% raw %}
339+
ARG prometheus_version=2.54.1
340+
ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz
341+
{% endraw %}
332342
333343
# Dict mapping image customization variable names to their values.
334344
# Each variable takes the form:
@@ -393,18 +403,7 @@ kolla_build_customizations_ubuntu: {}
393403
kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_rocky if kolla_base_distro == 'rocky' else kolla_build_customizations_ubuntu) }}"
394404

395405
# Dict mapping Kolla Dockerfile ARG names to their values.
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-
406+
# kolla_build_args:
408407

409408
###############################################################################
410409
# Kolla-ansible inventory configuration.

0 commit comments

Comments
 (0)