summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
commitdd2506e325d1a2858da353f96251f093e94bbcf3 (patch)
tree132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /playbooks/common/openshift-master
parentf004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff)
parentbf520e46e6916a4c9995ea95fa40cdd25f31209e (diff)
downloadopenshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip
Merge branch 'master' into upgrade33
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index f17f6a1e9..dbf071b67 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -46,7 +46,7 @@
openshift_hosted_metrics_duration: "{{ lookup('oo_option', 'openshift_hosted_metrics_duration') | default(7) }}"
when: openshift_hosted_metrics_duration is not defined
- set_fact:
- openshift_hosted_metrics_resolution: "{{ lookup('oo_option', 'openshift_hosted_metrics_resolution') | default(10) }}"
+ openshift_hosted_metrics_resolution: "{{ lookup('oo_option', 'openshift_hosted_metrics_resolution') | default('10s', true) }}"
when: openshift_hosted_metrics_resolution is not defined
roles:
- openshift_facts