summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics/vars
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2017-08-23 09:56:34 -0500
committerEric Wolinetz <ewolinet@redhat.com>2017-09-20 16:43:27 -0500
commitb2fdc1cb5e38e39250af702d1e19ed691e4df7d5 (patch)
treeb5e8368514f9ae29f6fefef1d5e7ae7d8c1ee95c /roles/openshift_metrics/vars
parent457e0f80784820b9ff0fb6a7407c271731f5b1d9 (diff)
downloadopenshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.tar.gz
openshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.tar.bz2
openshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.tar.xz
openshift-b2fdc1cb5e38e39250af702d1e19ed691e4df7d5.zip
Creating structure to warn for use of deprecated variables and set them in a single location before they are no longer honored
Diffstat (limited to 'roles/openshift_metrics/vars')
-rw-r--r--roles/openshift_metrics/vars/default_images.yml4
-rw-r--r--roles/openshift_metrics/vars/openshift-enterprise.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_metrics/vars/default_images.yml b/roles/openshift_metrics/vars/default_images.yml
index 678c4104c..8704ddfa0 100644
--- a/roles/openshift_metrics/vars/default_images.yml
+++ b/roles/openshift_metrics/vars/default_images.yml
@@ -1,3 +1,3 @@
---
-__openshift_metrics_image_prefix: "{{ openshift_hosted_metrics_deployer_prefix | default('docker.io/openshift/origin-') }}"
-__openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default('latest') }}"
+__openshift_metrics_image_prefix: "docker.io/openshift/origin-"
+__openshift_metrics_image_version: "latest"
diff --git a/roles/openshift_metrics/vars/openshift-enterprise.yml b/roles/openshift_metrics/vars/openshift-enterprise.yml
index f0bdac7d2..68cdf06fe 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 ('v3.6') }}"
+__openshift_metrics_image_prefix: "registry.access.redhat.com/openshift3/"
+__openshift_metrics_image_version: "v3.6"