diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-07 10:27:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 10:27:45 -0800 |
| commit | 7a068268ed83cc3e86c8cbc0c2e62c667ba9e109 (patch) | |
| tree | 96ec3e2e2fe16c2da4389ce9af9332e2e14d34e3 /roles/openshift_prometheus/tasks | |
| parent | 2f9a48cec48fa064d30d6a88077c5ef75d2555ab (diff) | |
| parent | e20abdd385770200f6b84e7f208120ad62a01f2a (diff) | |
| download | openshift-7a068268ed83cc3e86c8cbc0c2e62c667ba9e109.tar.gz openshift-7a068268ed83cc3e86c8cbc0c2e62c667ba9e109.tar.bz2 openshift-7a068268ed83cc3e86c8cbc0c2e62c667ba9e109.tar.xz openshift-7a068268ed83cc3e86c8cbc0c2e62c667ba9e109.zip | |
Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-vars
Automatic merge from submit-queue.
Fix prometheus default vars
Currently, prometheus role tries to set some defaults depending
on openshift_deployment_type.
This commit simplifies that logic.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509782
Diffstat (limited to 'roles/openshift_prometheus/tasks')
| -rw-r--r-- | roles/openshift_prometheus/tasks/main.yaml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/roles/openshift_prometheus/tasks/main.yaml b/roles/openshift_prometheus/tasks/main.yaml index 332104d77..5cc9a67eb 100644 --- a/roles/openshift_prometheus/tasks/main.yaml +++ b/roles/openshift_prometheus/tasks/main.yaml @@ -2,20 +2,9 @@ - name: Set default image variables based on deployment_type include_vars: "{{ item }}" with_first_found: - - "{{ openshift_deployment_type | default(deployment_type) }}.yml" + - "{{ openshift_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 register: mktemp |