summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-17 11:18:56 -0500
committerGitHub <noreply@github.com>2017-04-17 11:18:56 -0500
commit55ed83ed95d57808f3b6917016d6021cc3f7c9f5 (patch)
tree16b70b059ff6d244bc7fd2f6f3ce0dbd55250840 /roles
parent893044d72185743afee18c61aa532dc4a94e5861 (diff)
parent47db3dbb498f1792b87e0431a103c0a631604379 (diff)
downloadopenshift-55ed83ed95d57808f3b6917016d6021cc3f7c9f5.tar.gz
openshift-55ed83ed95d57808f3b6917016d6021cc3f7c9f5.tar.bz2
openshift-55ed83ed95d57808f3b6917016d6021cc3f7c9f5.tar.xz
openshift-55ed83ed95d57808f3b6917016d6021cc3f7c9f5.zip
Merge pull request #3926 from sdodson/fix-enterprise-prefixes
Merged by openshift-bot
Diffstat (limited to 'roles')
-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 9679d209a..92e68a0a3 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(openshift_release | default ('3.5.0') ) }}"
+__openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default ('3.6.0') }}"
diff --git a/roles/openshift_metrics/vars/openshift-enterprise.yml b/roles/openshift_metrics/vars/openshift-enterprise.yml
index f28c3ce48..b20957550 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(openshift_release | default ('3.5.0') ) }}"
+__openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default ('3.6.0') }}"