summaryrefslogtreecommitdiffstats
path: root/roles/openshift_prometheus/tasks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-02 19:47:55 -0700
committerGitHub <noreply@github.com>2017-11-02 19:47:55 -0700
commitaa8230f5ec8f2f6185ea347a9d3a88c461462d2d (patch)
tree198e8216806fd4e91b73b9ba91a2e62d5dab1d96 /roles/openshift_prometheus/tasks
parent39a03a42f3ba7cc84313399c4caa91b7924cde74 (diff)
parentd9b3b562e84439127400526d620792523382b589 (diff)
downloadopenshift-aa8230f5ec8f2f6185ea347a9d3a88c461462d2d.tar.gz
openshift-aa8230f5ec8f2f6185ea347a9d3a88c461462d2d.tar.bz2
openshift-aa8230f5ec8f2f6185ea347a9d3a88c461462d2d.tar.xz
openshift-aa8230f5ec8f2f6185ea347a9d3a88c461462d2d.zip
Merge pull request #5969 from sdodson/prom-images
Automatic merge from submit-queue. Add enterprise prometheus image defaults, simplify image_prefix Only require that openshift_prometheus_image_prefix be set to affect all other prefixes. Unfortunately the image_version for origin varies by image so a common image_version cannot be used.
Diffstat (limited to 'roles/openshift_prometheus/tasks')
-rw-r--r--roles/openshift_prometheus/tasks/main.yaml16
1 files changed, 16 insertions, 0 deletions
diff --git a/roles/openshift_prometheus/tasks/main.yaml b/roles/openshift_prometheus/tasks/main.yaml
index 523a64334..332104d77 100644
--- a/roles/openshift_prometheus/tasks/main.yaml
+++ b/roles/openshift_prometheus/tasks/main.yaml
@@ -1,4 +1,20 @@
---
+- name: Set default image variables based on deployment_type
+ include_vars: "{{ item }}"
+ with_first_found:
+ - "{{ openshift_deployment_type | default(deployment_type) }}.yml"
+ - "default_images.yml"
+
+- name: Set image facts
+ set_fact:
+ openshift_prometheus_image_prefix: "{{ openshift_prometheus_image_prefix | default(__openshift_prometheus_image_prefix) }}"
+ openshift_prometheus_image_version: "{{ openshift_prometheus_image_version | default(__openshift_prometheus_image_version) }}"
+ openshift_prometheus_proxy_image_prefix: "{{ openshift_prometheus_proxy_image_prefix | default(openshift_prometheus_image_prefix) }}"
+ openshift_prometheus_proxy_image_version: "{{ openshift_prometheus_proxy_image_version | default(__openshift_prometheus_proxy_image_version) }}"
+ openshift_prometheus_alertmanager_image_prefix: "{{ openshift_prometheus_altermanager_image_prefix | default(openshift_prometheus_image_prefix) }}"
+ openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default(__openshift_prometheus_alertmanager_image_version) }}"
+ openshift_prometheus_alertbuffer_image_prefix: "{{ openshift_prometheus_alertbuffer_image_prefix | default(openshift_prometheus_image_prefix) }}"
+ openshift_prometheus_alertbuffer_image_version: "{{ openshift_prometheus_alertbuffer_image_version | default(__openshift_prometheus_alertbuffer_image_version) }}"
- name: Create temp directory for doing work in on target
command: mktemp -td openshift-prometheus-ansible-XXXXXX