From 4aed04409b604f9da0d9a80278f42af9cc9e0128 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Wed, 27 Feb 2019 13:59:44 +0000 Subject: [PATCH] Default to Prometheus tag for all Prometheus images This allows an operator to pin the Prometheus docker image tag for all Prometheus images to that specified by the `prometheus_tag`. Without this change, the alert manager and cadvisor tags would also need to be set. Change-Id: Iadef001af7d3be5b2a39ce5e2363d05a33a775e4 --- ansible/roles/prometheus/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index 34c745b672..c42b3188c9 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -148,11 +148,11 @@ prometheus_memcached_exporter_tag: "{{ prometheus_tag }}" prometheus_memcached_exporter_image_full: "{{ prometheus_memcached_exporter_image }}:{{ prometheus_memcached_exporter_tag }}" prometheus_cadvisor_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-prometheus-cadvisor" -prometheus_cadvisor_tag: "{{ openstack_release }}" +prometheus_cadvisor_tag: "{{ prometheus_tag }}" prometheus_cadvisor_image_full: "{{ prometheus_cadvisor_image }}:{{ prometheus_cadvisor_tag }}" prometheus_alertmanager_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-prometheus-alertmanager" -prometheus_alertmanager_tag: "{{ openstack_release }}" +prometheus_alertmanager_tag: "{{ prometheus_tag }}" prometheus_alertmanager_image_full: "{{ prometheus_alertmanager_image }}:{{ prometheus_alertmanager_tag }}" # Prometheus openstack_exporter