Convert tuned puppet to ansible
The tuned heat template was using puppet to configure the service. This change removes `tuned-baremetal-puppet.yaml` and replaces it with `tuned-baremetal-ansible.yaml` in an effort to decrease our reliance on puppet. The old puppet file name was removed from the resource registry template and replaced with the new file name. Additional changes were made to the tuned boot params template and tasks. These changes modify the tasks for readability and ensure we're not needlessly running shell commands. Because the parameter `TunedProfileName` is now used in the new ansible based templatei, changes have been made to ensure we're enforcing a consistent definition. > Once this change has been merged a follow-up patch will be made to puppet-tripleo to eliminate the tuned.pp manifest. Change-Id: I06d07f6f0949095cb716dd706e05f2e567c0d3d8 Signed-off-by: Kevin Carter <kecarter@redhat.com>
This commit is contained in:
parent
c06232fba2
commit
8e482688da
111
deployment/tuned/tuned-baremetal-ansible.yaml
Normal file
111
deployment/tuned/tuned-baremetal-ansible.yaml
Normal file
@ -0,0 +1,111 @@
|
||||
heat_template_version: rocky
|
||||
|
||||
description: >
|
||||
Configure tuned
|
||||
|
||||
parameters:
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
type: json
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry. This
|
||||
mapping overrides those in ServiceNetMapDefaults.
|
||||
type: json
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
type: string
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
EnablePackageInstall:
|
||||
default: 'false'
|
||||
description: Set to true to enable package installation at deploy time
|
||||
type: boolean
|
||||
TunedCustomProfile:
|
||||
default: ''
|
||||
description: The definition of a new tuned profile in INI format which
|
||||
will be named after the TunedProfileName and applied to the
|
||||
host. E.g. if TunedProfileName is 'my_profile', it creates
|
||||
the file '/etc/tuned/my_profile/tuned.conf' on host whose
|
||||
content is the value of TunedCustomProfile, e.g. "[main]\n
|
||||
include=throughput-performance\n[sysctl]\nvm.dirty_ratio=10"
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
TunedProfileName:
|
||||
default: 'throughput-performance'
|
||||
description: Tuned Profile to apply to the host
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for tuned
|
||||
value:
|
||||
service_name: tuned
|
||||
host_prep_tasks:
|
||||
- name: Install tuned
|
||||
package:
|
||||
name: tuned
|
||||
state: present
|
||||
when:
|
||||
- EnablePackageInstall | default(false) | bool
|
||||
|
||||
- name: Check for tuned-adm
|
||||
command: >-
|
||||
which tuned-adm
|
||||
environment:
|
||||
PATH: "/bin:/usr/bin:/sbin:/usr/sbin"
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
register: tuned_check
|
||||
|
||||
- name: Run tuned setup
|
||||
when:
|
||||
- tuned_check.rc == 0
|
||||
block:
|
||||
- name: Ensure profile directory exists
|
||||
file:
|
||||
path: "/etc/tuned/{{ tuned_profile }}"
|
||||
state: directory
|
||||
when:
|
||||
- (custom_profile is defined) and (custom_profile != '')
|
||||
|
||||
- name: Create custom tuned profile
|
||||
copy:
|
||||
content: "{{ custom_profile }}"
|
||||
dest: "/etc/tuned/{{ tuned_profile }}/tuned.conf"
|
||||
when:
|
||||
- (custom_profile is defined) and (custom_profile != '')
|
||||
|
||||
- name: Check tuned active profile
|
||||
slurp:
|
||||
src: "/etc/tuned/active_profile"
|
||||
register: tuned_active_profile
|
||||
|
||||
- name: Enable tuned profile
|
||||
command: >-
|
||||
tuned-adm profile {{ tuned_profile }}
|
||||
environment:
|
||||
PATH: "/bin:/usr/bin:/sbin:/usr/sbin"
|
||||
when:
|
||||
- ((tuned_active_profile['content'] | b64decode).strip()) != tuned_profile
|
||||
|
||||
ansible_group_vars:
|
||||
tuned_profile: {get_param: TunedProfileName}
|
||||
custom_profile: {get_param: TunedCustomProfile}
|
||||
EnablePackageInstall: {get_param: EnablePackageInstall}
|
@ -39,7 +39,7 @@ parameters:
|
||||
tags:
|
||||
- role_specific
|
||||
TunedProfileName:
|
||||
default: ""
|
||||
default: 'throughput-performance'
|
||||
type: string
|
||||
description: Tuned Profile to apply to the host
|
||||
tags:
|
||||
|
@ -2,9 +2,9 @@
|
||||
command: cat /proc/cmdline
|
||||
register: cmdline
|
||||
|
||||
- name: Get the active tuned profile
|
||||
command: tuned-adm active
|
||||
become: true
|
||||
- name: Check tuned active profile
|
||||
slurp:
|
||||
src: "/etc/tuned/active_profile"
|
||||
register: tuned_active_profile
|
||||
|
||||
# Kernel Args Configuration
|
||||
@ -34,24 +34,27 @@
|
||||
- block:
|
||||
- name: Check Tune-d Configuration file exists
|
||||
stat:
|
||||
path: /etc/tuned/{{ _TUNED_PROFILE_NAME_ }}-variables.conf
|
||||
path: "/etc/tuned/{{ _TUNED_PROFILE_NAME_ }}-variables.conf"
|
||||
register: tuned_conf_stat_result
|
||||
|
||||
- name: Tune-d Configuration
|
||||
lineinfile:
|
||||
dest: /etc/tuned/{{ _TUNED_PROFILE_NAME_ }}-variables.conf
|
||||
dest: "/etc/tuned/{{ _TUNED_PROFILE_NAME_ }}-variables.conf"
|
||||
regexp: '^isolated_cores=.*'
|
||||
line: 'isolated_cores={{ _TUNED_CORES_ }}'
|
||||
when: tuned_conf_stat_result.stat.exists and _TUNED_CORES_|default("") != ""
|
||||
|
||||
- name: Tune-d profile activation
|
||||
shell: tuned-adm profile {{ _TUNED_PROFILE_NAME_ }}
|
||||
command: >-
|
||||
tuned-adm profile {{ _TUNED_PROFILE_NAME_ }}
|
||||
|
||||
- name: Set reboot required fact
|
||||
set_fact:
|
||||
reboot_required: true
|
||||
become: true
|
||||
when:
|
||||
- _TUNED_PROFILE_NAME_|default("") != ""
|
||||
- _TUNED_PROFILE_NAME_|default("") not in tuned_active_profile.stdout_lines[0]
|
||||
- (_TUNED_PROFILE_NAME_ | default("")) != ""
|
||||
- (_TUNED_PROFILE_NAME_ | default("")) != (tuned_active_profile['content'] | b64decode).strip()
|
||||
|
||||
# Check if os-net-config has run once, if yes, no need for the below workaround
|
||||
- find:
|
||||
|
@ -191,7 +191,7 @@ resource_registry:
|
||||
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||
OS::TripleO::Services::TripleoUI: OS::Heat::None
|
||||
OS::TripleO::Services::Tuned: deployment/tuned/tuned-baremetal-puppet.yaml
|
||||
OS::TripleO::Services::Tuned: deployment/tuned/tuned-baremetal-ansible.yaml
|
||||
OS::TripleO::Services::Securetty: OS::Heat::None
|
||||
# TODO(aschultz): Remove this in U as we switched to a task in the deploy
|
||||
OS::TripleO::Services::SELinux: OS::Heat::None
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
deprecations:
|
||||
- The template `tuned-baremetal-puppet` has been deprecated. This template
|
||||
has been replaced by `tuned-baremetal-ansible` which provides for the same
|
||||
functionality and interfaces.
|
Loading…
Reference in New Issue
Block a user