summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_kibana/defaults
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-05-18 19:45:19 -0500
committerewolinetz <ewolinet@redhat.com>2017-05-22 10:42:54 -0500
commit7426996929fe298f4da0b238e38d91fb929b5112 (patch)
tree13d0f61eceb13967e862fcaa3b6c776b83ed4e95 /roles/openshift_logging_kibana/defaults
parent186d744cee0bda007e196358da5fe5e94187e0d3 (diff)
downloadopenshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.gz
openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.bz2
openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.xz
openshift-7426996929fe298f4da0b238e38d91fb929b5112.zip
Pulling changes from master branch
Diffstat (limited to 'roles/openshift_logging_kibana/defaults')
-rw-r--r--roles/openshift_logging_kibana/defaults/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_kibana/defaults/main.yml b/roles/openshift_logging_kibana/defaults/main.yml
index 6474cd504..23337bcd2 100644
--- a/roles/openshift_logging_kibana/defaults/main.yml
+++ b/roles/openshift_logging_kibana/defaults/main.yml
@@ -9,7 +9,7 @@ openshift_logging_kibana_namespace: logging
openshift_logging_kibana_nodeselector: ""
openshift_logging_kibana_cpu_limit: null
-openshift_logging_kibana_memory_limit: null
+openshift_logging_kibana_memory_limit: 736Mi
openshift_logging_kibana_hostname: "kibana.router.default.svc.cluster.local"
@@ -26,7 +26,7 @@ openshift_logging_kibana_ops_deployment: false
# Proxy settings
openshift_logging_kibana_proxy_debug: false
openshift_logging_kibana_proxy_cpu_limit: null
-openshift_logging_kibana_proxy_memory_limit: null
+openshift_logging_kibana_proxy_memory_limit: 96Mi
#The absolute path on the control node to the cert file to use
#for the public facing kibana certs