diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-02 19:47:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 19:47:55 -0700 |
| commit | aa8230f5ec8f2f6185ea347a9d3a88c461462d2d (patch) | |
| tree | 198e8216806fd4e91b73b9ba91a2e62d5dab1d96 /roles/flannel | |
| parent | 39a03a42f3ba7cc84313399c4caa91b7924cde74 (diff) | |
| parent | d9b3b562e84439127400526d620792523382b589 (diff) | |
| download | openshift-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/flannel')
0 files changed, 0 insertions, 0 deletions