From 433739d7686ade3f99e1b81eabf850b75285220f Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sun, 28 May 2023 16:51:17 -0400 Subject: [PATCH] Add AMD cpu role for mrmanager. --- ansible/environments/colo/host_vars/mrmanager | 1 + ansible/playbook.yaml | 1 + ansible/roles/cpu/files/amdtemp_loader.conf | 2 ++ ...wer_profile.conf => power_profile_rc.conf} | 0 ansible/roles/cpu/tasks/freebsd_amd.yaml | 29 +++++++++++++++++++ ansible/roles/cpu/tasks/freebsd_intel.yaml | 9 +++--- 6 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 ansible/roles/cpu/files/amdtemp_loader.conf rename ansible/roles/cpu/files/{power_profile.conf => power_profile_rc.conf} (100%) create mode 100644 ansible/roles/cpu/tasks/freebsd_amd.yaml diff --git a/ansible/environments/colo/host_vars/mrmanager b/ansible/environments/colo/host_vars/mrmanager index 285145c..166bd58 100644 --- a/ansible/environments/colo/host_vars/mrmanager +++ b/ansible/environments/colo/host_vars/mrmanager @@ -10,3 +10,4 @@ pf_config: "mrmanager_pf.conf" pflog_conf: - name: 0 dev: pflog0 +cputype: "amd" diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml index 83c4ecd..acba8e9 100644 --- a/ansible/playbook.yaml +++ b/ansible/playbook.yaml @@ -77,3 +77,4 @@ - sshd - base - firewall + - cpu diff --git a/ansible/roles/cpu/files/amdtemp_loader.conf b/ansible/roles/cpu/files/amdtemp_loader.conf new file mode 100644 index 0000000..ccafa06 --- /dev/null +++ b/ansible/roles/cpu/files/amdtemp_loader.conf @@ -0,0 +1,2 @@ +# Read CPU temperature on AMD CPUs. +amdtemp_load="YES" diff --git a/ansible/roles/cpu/files/power_profile.conf b/ansible/roles/cpu/files/power_profile_rc.conf similarity index 100% rename from ansible/roles/cpu/files/power_profile.conf rename to ansible/roles/cpu/files/power_profile_rc.conf diff --git a/ansible/roles/cpu/tasks/freebsd_amd.yaml b/ansible/roles/cpu/tasks/freebsd_amd.yaml new file mode 100644 index 0000000..e48a76e --- /dev/null +++ b/ansible/roles/cpu/tasks/freebsd_amd.yaml @@ -0,0 +1,29 @@ +- name: Install loader.conf + copy: + src: "files/{{ item }}_loader.conf" + dest: "/boot/loader.conf.d/{{ item }}.conf" + mode: 0644 + owner: root + group: wheel + loop: + - amdtemp + +- name: Install service configuration + copy: + src: "files/{{ item }}_rc.conf" + dest: "/etc/rc.conf.d/{{ item }}" + mode: 0644 + owner: root + group: wheel + loop: + - power_profile + +- name: Install loader.conf + copy: + src: "files/{{ item }}_loader.conf" + dest: "/boot/loader.conf.d/{{ item }}.conf" + mode: 0644 + owner: root + group: wheel + loop: + - aesni diff --git a/ansible/roles/cpu/tasks/freebsd_intel.yaml b/ansible/roles/cpu/tasks/freebsd_intel.yaml index 6f88399..adadda8 100644 --- a/ansible/roles/cpu/tasks/freebsd_intel.yaml +++ b/ansible/roles/cpu/tasks/freebsd_intel.yaml @@ -17,16 +17,15 @@ - cpuctl - aesni -- name: Install Configuration +- name: Install service configuration copy: - src: "files/{{ item.src }}" - dest: "{{ item.dest }}" + src: "files/{{ item }}_rc.conf" + dest: "/etc/rc.conf.d/{{ item }}" mode: 0644 owner: root group: wheel loop: - - src: power_profile.conf - dest: /etc/rc.conf.d/power_profile + - power_profile - name: Install packages when: hwpstate is defined and not hwpstate