summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-30 14:24:35 -0500
committerGitHub <noreply@github.com>2017-03-30 14:24:35 -0500
commit7e3141ae9193a39a55827ad2326bc8ac19e7e3ba (patch)
treed05a9c70732b2623040a411f3df32b0099b86a37
parentc540fcaa851f179866fed2478b0e2520162d8513 (diff)
parentcff716d2c695dce42ef96286af55426b144a8aaf (diff)
downloadopenshift-7e3141ae9193a39a55827ad2326bc8ac19e7e3ba.tar.gz
openshift-7e3141ae9193a39a55827ad2326bc8ac19e7e3ba.tar.bz2
openshift-7e3141ae9193a39a55827ad2326bc8ac19e7e3ba.tar.xz
openshift-7e3141ae9193a39a55827ad2326bc8ac19e7e3ba.zip
Merge pull request #3792 from ewolinetz/fix_metrics_image_settings
Merged by openshift-bot
-rw-r--r--playbooks/common/openshift-master/config.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 81c922043..60cf56108 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -48,12 +48,6 @@
- set_fact:
openshift_hosted_metrics_resolution: "{{ lookup('oo_option', 'openshift_hosted_metrics_resolution') | default('10s', true) }}"
when: openshift_hosted_metrics_resolution is not defined
- - set_fact:
- openshift_hosted_metrics_deployer_prefix: "{{ lookup('oo_option', 'openshift_hosted_metrics_deployer_prefix') | default('openshift') }}"
- when: openshift_hosted_metrics_deployer_prefix is not defined
- - set_fact:
- openshift_hosted_metrics_deployer_version: "{{ lookup('oo_option', 'openshift_hosted_metrics_deployer_version') | default('latest') }}"
- when: openshift_hosted_metrics_deployer_version is not defined
roles:
- openshift_facts
post_tasks: