summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-02 08:48:21 -0400
committerGitHub <noreply@github.com>2017-08-02 08:48:21 -0400
commit165e1ebe2a9ce0d77e96b8a0d09a95e85e2bd363 (patch)
tree4cfd82f64c9cb683fe286a76dd30f04a68fac840
parentb22ebdcce1c5ffea48cf95695d654d112da5c812 (diff)
parentdd5b9e23961fd85ddcbde93328d6b06376058c9e (diff)
downloadopenshift-165e1ebe2a9ce0d77e96b8a0d09a95e85e2bd363.tar.gz
openshift-165e1ebe2a9ce0d77e96b8a0d09a95e85e2bd363.tar.bz2
openshift-165e1ebe2a9ce0d77e96b8a0d09a95e85e2bd363.tar.xz
openshift-165e1ebe2a9ce0d77e96b8a0d09a95e85e2bd363.zip
Merge pull request #4958 from sdodson/logging-metrics-imagetag
Switch logging and metrics OCP image tag from 3.6.0 to v3.6
-rw-r--r--roles/openshift_logging/vars/openshift-enterprise.yml2
-rw-r--r--roles/openshift_metrics/vars/openshift-enterprise.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/vars/openshift-enterprise.yml b/roles/openshift_logging/vars/openshift-enterprise.yml
index 92e68a0a3..49e8a18af 100644
--- a/roles/openshift_logging/vars/openshift-enterprise.yml
+++ b/roles/openshift_logging/vars/openshift-enterprise.yml
@@ -1,3 +1,3 @@
---
__openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}"
-__openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default ('3.6.0') }}"
+__openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default ('v3.6') }}"
diff --git a/roles/openshift_metrics/vars/openshift-enterprise.yml b/roles/openshift_metrics/vars/openshift-enterprise.yml
index b20957550..f0bdac7d2 100644
--- a/roles/openshift_metrics/vars/openshift-enterprise.yml
+++ b/roles/openshift_metrics/vars/openshift-enterprise.yml
@@ -1,3 +1,3 @@
---
__openshift_metrics_image_prefix: "{{ openshift_hosted_metrics_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}"
-__openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default ('3.6.0') }}"
+__openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default ('v3.6') }}"