diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-06 16:42:30 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-11-07 09:22:16 -0500 |
commit | e20abdd385770200f6b84e7f208120ad62a01f2a (patch) | |
tree | 4181dd1e15256924accb07a374ac0b8746103201 /roles/openshift_prometheus/vars/openshift-enterprise.yml | |
parent | 9e5462826beb7bece09e55b20f3fe47a65c8b44c (diff) | |
download | openshift-e20abdd385770200f6b84e7f208120ad62a01f2a.tar.gz openshift-e20abdd385770200f6b84e7f208120ad62a01f2a.tar.bz2 openshift-e20abdd385770200f6b84e7f208120ad62a01f2a.tar.xz openshift-e20abdd385770200f6b84e7f208120ad62a01f2a.zip |
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/vars/openshift-enterprise.yml')
-rw-r--r-- | roles/openshift_prometheus/vars/openshift-enterprise.yml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/roles/openshift_prometheus/vars/openshift-enterprise.yml b/roles/openshift_prometheus/vars/openshift-enterprise.yml index 0b45e03d3..9bb4c99bb 100644 --- a/roles/openshift_prometheus/vars/openshift-enterprise.yml +++ b/roles/openshift_prometheus/vars/openshift-enterprise.yml @@ -1,7 +1,12 @@ --- -# image defaults -__openshift_prometheus_image_prefix: "registry.access.redhat.com/openshift3/" -__openshift_prometheus_image_version: "v3.7" -__openshift_prometheus_proxy_image_version: "v3.7" -__openshift_prometheus_alertmanager_image_version: "v3.7" -__openshift_prometheus_alertbuffer_image_version: "v3.7" +# image prefix defaults +l_openshift_prometheus_image_prefix: "{{ openshift_prometheus_image_prefix | default('registry.access.redhat.com/openshift3/') }}" +l_openshift_prometheus_proxy_image_prefix: "{{ openshift_prometheus_proxy_image_prefix | default(l_openshift_prometheus_image_prefix) }}" +l_openshift_prometheus_alertmanager_image_prefix: "{{ openshift_prometheus_altermanager_image_prefix | default(l_openshift_prometheus_image_prefix) }}" +l_openshift_prometheus_alertbuffer_image_prefix: "{{ openshift_prometheus_alertbuffer_image_prefix | default(l_openshift_prometheus_image_prefix) }}" + +# image version defaults +l_openshift_prometheus_image_version: "{{ openshift_prometheus_image_version | default('v3.7') }}" +l_openshift_prometheus_proxy_image_version: "{{ openshift_prometheus_proxy_image_version | default('v3.7') }}" +l_openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default('v3.7') }}" +l_openshift_prometheus_alertbuffer_image_version: "{{ openshift_prometheus_alertbuffer_image_version | default('v3.7') }}" |