Merge pull request #1016 from sdodson/BZ1190654

Merged by openshift-bot

Author: OpenShift Bot

openshift.spec

@@ -126,8 +126,12 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
 
 ln -s %{_bindir}/openshift %{buildroot}%{_bindir}/osc
 
-mkdir -p %{buildroot}%{_libdir}/tuned/openshift-node
-install -m 0644 -t %{buildroot}%{_libdir}/tuned/openshift-node tuned/openshift-node/tuned.conf
+install -d -m 0755 %{buildroot}%{_prefix}/lib/tuned/openshift-node-{guest,host}
+install -m 0644 tuned/openshift-node-guest/tuned.conf %{buildroot}%{_prefix}/lib/tuned/openshift-node-guest/
+install -m 0644 tuned/openshift-node-host/tuned.conf %{buildroot}%{_prefix}/lib/tuned/openshift-node-host/
+install -d -m 0755 %{buildroot}%{_mandir}/man7
+install -m 0644 tuned/man/tuned-profiles-openshift-node.7 %{buildroot}%{_mandir}/man7/tuned-profiles-openshift-node.7
+
 
 %files
 %defattr(-,root,root,-)
@@ -168,10 +172,17 @@ install -m 0644 -t %{buildroot}%{_libdir}/tuned/openshift-node tuned/openshift-n
 
 %files -n tuned-profiles-openshift-node
 %defattr(-,root,root,-)
-%{_libdir}/tuned/openshift-node
+%{_prefix}/lib/tuned/openshift-node-host
+%{_prefix}/lib/tuned/openshift-node-guest
+%{_mandir}/man7/tuned-profiles-openshift-node.7*
 
 %post -n tuned-profiles-openshift-node
-/usr/sbin/tuned-adm profile openshift-node > /dev/null 2>&1
+recommended=`/usr/sbin/tuned-adm recommend`
+if [[ "${recommended}" =~ guest ]] ; then
+  /usr/sbin/tuned-adm profile openshift-node-guest > /dev/null 2>&1
+else
+  /usr/sbin/tuned-adm profile openshift-node-host > /dev/null 2>&1
+fi
 
 %preun -n tuned-profiles-openshift-node
 # reset the tuned profile to the recommended profile

tuned/man/tuned-profiles-openshift-node.7

@@ -0,0 +1,59 @@
+.\"/* 
+.\" * All rights reserved
+.\" * Copyright (C) 2015 Red Hat, Inc.
+.\" * Authors: Jaroslav Škarvada, Scott Dodson
+.\" *
+.\" * This program is free software; you can redistribute it and/or
+.\" * modify it under the terms of the GNU General Public License
+.\" * as published by the Free Software Foundation; either version 2
+.\" * of the License, or (at your option) any later version.
+.\" *
+.\" * This program is distributed in the hope that it will be useful,
+.\" * but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" * GNU General Public License for more details.
+.\" *
+.\" * You should have received a copy of the GNU General Public License
+.\" * along with this program; if not, write to the Free Software
+.\" * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+.\" */
+.\" 
+.TH TUNED_PROFILES_OPENSHIFT_NODE "7" "12 Feb 2015" "OpenShift" "tuned"
+.SH NAME
+tuned\-profiles\-openshift-node - description of profiles provided for OpenShift
+
+.SH DESCRIPTION
+These profiles are provided for OpenShift nodes. They provide performance
+optimizations for OpenShift Nodes running on either bare metal
+(openshift-node-host) or virtual machines (openshift-node-guest).
+
+.SH PROFILES
+The following profiles are provided:
+
+.TP
+.BI "openshift-node\-host"
+Profile optimized for OpenShift hosts (bare metal). It is based on throughput\-performance
+profile. It additionally increases SELinux AVC cache, PID limit and tunes
+netfilter connections tracking.
+
+.TP
+.BI "openshift-node\-guest"
+Profile optimized for virtual OpenShift guests. It is based on virtual\-guest
+profile. It additionally increases SELinux AVC cache, PID limit and tunes
+netfilter connections tracking.
+
+.SH "FILES"
+.NF
+.I /etc/tuned/*
+.I /usr/lib/tuned/*
+
+.SH "SEE ALSO"
+.BR tuned (8)
+.BR tuned\-adm (8)
+.BR tuned\-profiles (7)
+.BR tuned\-profiles\-sap (7)
+.BR tuned\-profiles\-sap\-hana (7)
+.BR tuned\-profiles\-compat (7)
+.SH AUTHOR
+.NF
+Scott Dodson <[email protected]>

tuned/openshift-node-guest/tuned.conf

@@ -0,0 +1,16 @@
+#
+# tuned configuration
+#
+
+[main]
+include=virtual-guest
+
+[selinux]
+avc_cache_threshold=65536
+
+[net]
+nf_conntrack_hashsize=131072
+
+[sysctl]
+kernel.pid_max=131072
+net.netfilter.nf_conntrack_max=1048576