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 /tox.ini | |
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 'tox.ini')
0 files changed, 0 insertions, 0 deletions