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/vars | |
| 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/vars')
| -rw-r--r-- | roles/openshift_prometheus/vars/default_images.yml | 17 | ||||
| -rw-r--r-- | roles/openshift_prometheus/vars/openshift-enterprise.yml | 17 |
2 files changed, 22 insertions, 12 deletions
diff --git a/roles/openshift_prometheus/vars/default_images.yml b/roles/openshift_prometheus/vars/default_images.yml index 4092eb2d4..ad52a3125 100644 --- a/roles/openshift_prometheus/vars/default_images.yml +++ b/roles/openshift_prometheus/vars/default_images.yml @@ -1,7 +1,12 @@ --- -# image defaults -__openshift_prometheus_image_prefix: "openshift/" -__openshift_prometheus_image_version: "v2.0.0-dev.3" -__openshift_prometheus_proxy_image_version: "v1.0.0" -__openshift_prometheus_alertmanager_image_version: "v0.9.1" -__openshift_prometheus_alertbuffer_image_version: "v0.0.2" +# image prefix defaults +l_openshift_prometheus_image_prefix: "{{ openshift_prometheus_image_prefix | default('openshift/') }}" +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('v2.0.0-dev.3') }}" +l_openshift_prometheus_proxy_image_version: "{{ openshift_prometheus_proxy_image_version | default('v1.0.0') }}" +l_openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default('v0.9.1') }}" +l_openshift_prometheus_alertbuffer_image_version: "{{ openshift_prometheus_alertbuffer_image_version | default('v0.0.2') }}" 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') }}" |