summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-10 12:54:03 -0700
committerGitHub <noreply@github.com>2017-10-10 12:54:03 -0700
commitbb4df1cf799d66493b0679f0993cd0a1fe829a00 (patch)
tree180ed9708afe47b1c554bab0c70f7ec33007b828 /roles/openshift_node
parent48126155eade2d030398f69dc5ee32838ec08480 (diff)
parent17e38ad8c62ac8f1c8f983e63181f69879a45d85 (diff)
downloadopenshift-bb4df1cf799d66493b0679f0993cd0a1fe829a00.tar.gz
openshift-bb4df1cf799d66493b0679f0993cd0a1fe829a00.tar.bz2
openshift-bb4df1cf799d66493b0679f0993cd0a1fe829a00.tar.xz
openshift-bb4df1cf799d66493b0679f0993cd0a1fe829a00.zip
Merge pull request #5645 from jmencak/tuned-role-lb
Automatic merge from submit-queue. Separate tuned daemon setup into a role. Also adding support for the loadbalancer. It is important to raise ARP cache limits on HA setups with loadbalancers serving 1k+ nodes.
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/config.yml4
-rw-r--r--roles/openshift_node/tasks/tuned.yml41
-rw-r--r--roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf25
-rw-r--r--roles/openshift_node/templates/tuned/openshift-node/tuned.conf10
-rw-r--r--roles/openshift_node/templates/tuned/openshift/tuned.conf24
-rw-r--r--roles/openshift_node/templates/tuned/recommend.conf8
6 files changed, 0 insertions, 112 deletions
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index e3898b520..e5fcaf9af 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -111,9 +111,5 @@
msg: Node failed to start please inspect the logs and try again
when: node_start_result | failed
-- name: Setup tuned
- include: tuned.yml
- static: yes
-
- set_fact:
node_service_status_changed: "{{ node_start_result | changed }}"
diff --git a/roles/openshift_node/tasks/tuned.yml b/roles/openshift_node/tasks/tuned.yml
deleted file mode 100644
index 425bf6a26..000000000
--- a/roles/openshift_node/tasks/tuned.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Check for tuned package
- command: rpm -q tuned
- args:
- warn: no
- register: tuned_installed
- changed_when: false
- failed_when: false
-
-- name: Tuned service setup
- block:
- - name: Set tuned OpenShift variables
- set_fact:
- openshift_tuned_guest_profile: "{{ 'atomic-guest' if openshift.common.is_atomic else 'virtual-guest' }}"
- tuned_etc_directory: '/etc/tuned'
- tuned_templates_source: '../templates/tuned'
-
- - name: Ensure directory structure exists
- file:
- state: directory
- dest: '{{ tuned_etc_directory }}/{{ item.path }}'
- with_filetree: '{{ tuned_templates_source }}'
- when: item.state == 'directory'
-
- - name: Ensure files are populated from templates
- template:
- src: '{{ item.src }}'
- dest: '{{ tuned_etc_directory }}/{{ item.path }}'
- with_filetree: '{{ tuned_templates_source }}'
- when: item.state == 'file'
-
- - name: Make tuned use the recommended tuned profile on restart
- file: path=/etc/tuned/active_profile state=absent
-
- - name: Restart tuned service
- systemd:
- state: restarted
- daemon_reload: yes
- name: tuned
-
- when: tuned_installed.rc == 0 | bool
diff --git a/roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf b/roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf
deleted file mode 100644
index f22f21065..000000000
--- a/roles/openshift_node/templates/tuned/openshift-control-plane/tuned.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# tuned configuration
-#
-
-[main]
-summary=Optimize systems running OpenShift control plane
-include=openshift
-
-[sysctl]
-# ktune sysctl settings, maximizing i/o throughput
-#
-# Minimal preemption granularity for CPU-bound tasks:
-# (default: 1 msec# (1 + ilog(ncpus)), units: nanoseconds)
-kernel.sched_min_granularity_ns=10000000
-
-# The total time the scheduler will consider a migrated process
-# "cache hot" and thus less likely to be re-migrated
-# (system default is 500000, i.e. 0.5 ms)
-kernel.sched_migration_cost_ns=5000000
-
-# SCHED_OTHER wake-up granularity.
-#
-# Preemption granularity when tasks wake up. Lower the value to improve
-# wake-up latency and throughput for latency critical tasks.
-kernel.sched_wakeup_granularity_ns = 4000000
diff --git a/roles/openshift_node/templates/tuned/openshift-node/tuned.conf b/roles/openshift_node/templates/tuned/openshift-node/tuned.conf
deleted file mode 100644
index 78c7d19c9..000000000
--- a/roles/openshift_node/templates/tuned/openshift-node/tuned.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# tuned configuration
-#
-
-[main]
-summary=Optimize systems running OpenShift nodes
-include=openshift
-
-[sysctl]
-net.ipv4.tcp_fastopen=3
diff --git a/roles/openshift_node/templates/tuned/openshift/tuned.conf b/roles/openshift_node/templates/tuned/openshift/tuned.conf
deleted file mode 100644
index 68ac5dadb..000000000
--- a/roles/openshift_node/templates/tuned/openshift/tuned.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# tuned configuration
-#
-
-[main]
-summary=Optimize systems running OpenShift (parent profile)
-include=${f:virt_check:{{ openshift_tuned_guest_profile }}:throughput-performance}
-
-[selinux]
-avc_cache_threshold=65536
-
-[net]
-nf_conntrack_hashsize=131072
-
-[sysctl]
-kernel.pid_max=131072
-net.netfilter.nf_conntrack_max=1048576
-fs.inotify.max_user_watches=65536
-net.ipv4.neigh.default.gc_thresh1=8192
-net.ipv4.neigh.default.gc_thresh2=32768
-net.ipv4.neigh.default.gc_thresh3=65536
-net.ipv6.neigh.default.gc_thresh1=8192
-net.ipv6.neigh.default.gc_thresh2=32768
-net.ipv6.neigh.default.gc_thresh3=65536
diff --git a/roles/openshift_node/templates/tuned/recommend.conf b/roles/openshift_node/templates/tuned/recommend.conf
deleted file mode 100644
index 5fa765798..000000000
--- a/roles/openshift_node/templates/tuned/recommend.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[openshift-node]
-/etc/origin/node/node-config.yaml=.*region=primary
-
-[openshift-control-plane,master]
-/etc/origin/master/master-config.yaml=.*
-
-[openshift-control-plane,node]
-/etc/origin/node/node-config.yaml=.*region=infra