diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-12 14:20:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 14:20:29 -0500 |
| commit | ad18b8ee7a2468413c70cc4f263c6a147acb5fef (patch) | |
| tree | 2b09679de3894031f045394c99fd88ab9b1f36b0 /roles/openshift_logging/defaults | |
| parent | d1d60e24b54ca6ba0dc98e8b0b2ea4cfa8b92830 (diff) | |
| parent | ba4c43fe61ca40b347a9f75891ba67ab36465871 (diff) | |
| download | openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.tar.gz openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.tar.bz2 openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.tar.xz openshift-ad18b8ee7a2468413c70cc4f263c6a147acb5fef.zip | |
Merge pull request #4162 from jcantrill/bz1439451_kibana_crash
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/defaults')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 76dfe518e..f43336dc4 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -26,10 +26,10 @@ openshift_logging_curator_ops_nodeselector: "{{ openshift_hosted_logging_curator openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" openshift_logging_kibana_cpu_limit: null -openshift_logging_kibana_memory_limit: null +openshift_logging_kibana_memory_limit: 736Mi 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 openshift_logging_kibana_replica_count: 1 openshift_logging_kibana_edge_term_policy: Redirect @@ -50,10 +50,10 @@ openshift_logging_kibana_ca: "" openshift_logging_kibana_ops_hostname: "{{ openshift_hosted_logging_ops_hostname | default('kibana-ops.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" openshift_logging_kibana_ops_cpu_limit: null -openshift_logging_kibana_ops_memory_limit: null +openshift_logging_kibana_ops_memory_limit: 736Mi openshift_logging_kibana_ops_proxy_debug: false openshift_logging_kibana_ops_proxy_cpu_limit: null -openshift_logging_kibana_ops_proxy_memory_limit: null +openshift_logging_kibana_ops_proxy_memory_limit: 96Mi openshift_logging_kibana_ops_replica_count: 1 #The absolute path on the control node to the cert file to use |