summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-06 09:23:18 -0800
committerGitHub <noreply@github.com>2018-02-06 09:23:18 -0800
commitfa6c7cc621ff05b35eadc846d3960ac2dc1009c0 (patch)
tree43e1137f4034514e88194e9109640f7b60817a2a /playbooks
parent75e1741b2068f6b01a9e77db0c0518f5c0154822 (diff)
parent2e1598117fe896033a3f290820c8e8dfbc42bd81 (diff)
downloadopenshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.gz
openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.bz2
openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.xz
openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.zip
Merge pull request #6628 from ewolinetz/es_5.x_opt_in
Automatic merge from submit-queue. Es 5.x opt in FYI @richm @jcantrill
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/openshift-logging/private/config.yml41
1 files changed, 36 insertions, 5 deletions
diff --git a/playbooks/openshift-logging/private/config.yml b/playbooks/openshift-logging/private/config.yml
index 07aa8bfde..f2a57f9f8 100644
--- a/playbooks/openshift-logging/private/config.yml
+++ b/playbooks/openshift-logging/private/config.yml
@@ -11,6 +11,38 @@
status: "In Progress"
start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+- name: Update vm.max_map_count for ES 5.x
+ hosts: all
+ gather_facts: false
+ tasks:
+ - when:
+ - openshift_logging_es5_techpreview | default(false) | bool
+ - openshift_deployment_type in ['origin']
+ block:
+ - name: Checking vm max_map_count value
+ command:
+ cat /proc/sys/vm/max_map_count
+ register: _vm_max_map_count
+
+ - stat:
+ path: /etc/sysctl.d/99-elasticsearch.conf
+ register: _99_es_conf
+
+ - name: Check for current value of vm.max_map_count in 99-elasticsearch.conf
+ command: >
+ sed /etc/sysctl.d/99-elasticsearch.conf -e 's/vm.max_map_count=\(.*\)/\1/'
+ register: _curr_vm_max_map_count
+ when: _99_es_conf.stat.exists
+
+ - name: Updating vm.max_map_count value
+ sysctl:
+ name: vm.max_map_count
+ value: 262144
+ sysctl_file: "/etc/sysctl.d/99-elasticsearch.conf"
+ reload: yes
+ when:
+ - _vm_max_map_count.stdout | default(0) | int < 262144 | int or _curr_vm_max_map_count.stdout | default(0) | int < 262144
+
- name: OpenShift Aggregated Logging
hosts: oo_first_master
roles:
@@ -20,11 +52,10 @@
- name: Update Master configs
hosts: oo_masters:!oo_first_master
tasks:
- - block:
- - import_role:
- name: openshift_logging
- tasks_from: update_master_config
- when: not openshift.common.version_gte_3_9
+ - include_role:
+ name: openshift_logging
+ tasks_from: update_master_config
+ when: not openshift.common.version_gte_3_9
- name: Logging Install Checkpoint End
hosts: all