summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-13 19:05:17 -0400
committerGitHub <noreply@github.com>2017-09-13 19:05:17 -0400
commitf0315bb58c2664d5778e8c6d29ac03475282d474 (patch)
tree5f68af62c09f22d12be1f058cfbd0188138a758b /roles/openshift_node
parent461d13747238b9ebddbc370de79bee0ece38b7a8 (diff)
parent50f43c68a57f18e6b66dc49de6204780c435d584 (diff)
downloadopenshift-f0315bb58c2664d5778e8c6d29ac03475282d474.tar.gz
openshift-f0315bb58c2664d5778e8c6d29ac03475282d474.tar.bz2
openshift-f0315bb58c2664d5778e8c6d29ac03475282d474.tar.xz
openshift-f0315bb58c2664d5778e8c6d29ac03475282d474.zip
Merge pull request #5370 from jmencak/tuned-openshift-ansible-bad_merge-fix
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/config.yml14
-rw-r--r--roles/openshift_node/tasks/install.yml4
2 files changed, 4 insertions, 14 deletions
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index 7af3f54b5..1504d01af 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -2,17 +2,9 @@
- name: Install the systemd units
include: systemd_units.yml
-- name: Check for tuned package
- command: rpm -q tuned
- args:
- warn: no
- register: tuned_installed
- changed_when: false
- failed_when: false
-
-- name: Set atomic-guest tuned profile
- command: "tuned-adm profile atomic-guest"
- when: tuned_installed.rc == 0 and openshift.common.is_atomic | bool
+- name: Setup tuned
+ include: tuned.yml
+ static: yes
- name: Start and enable openvswitch service
systemd:
diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml
index 02b8ee67c..265bf2c46 100644
--- a/roles/openshift_node/tasks/install.yml
+++ b/roles/openshift_node/tasks/install.yml
@@ -1,11 +1,9 @@
---
-# We have to add tuned-profiles in the same transaction otherwise we run into depsolving
-# problems because the rpms don't pin the version properly. This was fixed in 3.1 packaging.
- when: not openshift.common.is_containerized | bool
block:
- name: Install Node package
package:
- name: "{{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}"
+ name: "{{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}"
state: present
- name: Install sdn-ovs package