summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-25 16:15:56 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-25 16:15:56 -0400
commit7cf2ef446cde3f54d4c7095aba20e594c5747630 (patch)
tree64e983078a369637ea18c3be10ac1115bfa4ca8c /playbooks/common
parent407dd1d28f06a3b66c2eeaa05a81279c7704779d (diff)
parent3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff)
downloadopenshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.gz
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.bz2
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.xz
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.zip
Merge branch 'master' into evac
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/config.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index c9d94bec5..0b0faaa22 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -42,6 +42,12 @@
- set_fact:
openshift_hosted_metrics_deploy: "{{ lookup('oo_option', 'openshift_hosted_metrics_deploy') | default(false, true) }}"
when: openshift_hosted_metrics_deploy is not defined
+ - set_fact:
+ 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) }}"
+ when: openshift_hosted_metrics_resolution is not defined
roles:
- openshift_facts