diff options
| author | Jiri Mencak <jmencak@redhat.com> | 2017-09-12 11:43:16 +0200 |
|---|---|---|
| committer | Jiri Mencak <jmencak@redhat.com> | 2017-09-12 12:02:48 +0200 |
| commit | 50f43c68a57f18e6b66dc49de6204780c435d584 (patch) | |
| tree | ef7e30395cb6582ca3cfbbae481917ff41b9a8da | |
| parent | 555503784981589562a281e0d96ed89114a02e61 (diff) | |
| download | openshift-50f43c68a57f18e6b66dc49de6204780c435d584.tar.gz openshift-50f43c68a57f18e6b66dc49de6204780c435d584.tar.bz2 openshift-50f43c68a57f18e6b66dc49de6204780c435d584.tar.xz openshift-50f43c68a57f18e6b66dc49de6204780c435d584.zip | |
Re-enabling new tuned profile hierarchy (PR5089)
| -rw-r--r-- | roles/openshift_node/tasks/config.yml | 14 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/install.yml | 4 |
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 |