From 5d1abf2bb25a6c0ba01501cd5294725c6bcea0ab Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Fri, 6 Aug 2021 17:02:12 +0800 Subject: [PATCH] =?UTF-8?q?TSG-6676=20=E5=AF=B9slice=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=99=90=E5=88=B6=E7=9A=84override=E6=96=87=E4=BB=B6=E4=BB=8E/?= =?UTF-8?q?etc/=E7=9B=AE=E5=BD=95=E7=A7=BB=E5=8A=A8=E5=88=B0/usr/lib/syste?= =?UTF-8?q?md/system/=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system-init-7400-mcn0/tasks/main.yml | 24 +++++++++---------- .../system-init-7400-mcn123/tasks/main.yml | 24 +++++++++---------- ansible/roles/system-init-9140/tasks/main.yml | 24 +++++++++---------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ansible/roles/system-init-7400-mcn0/tasks/main.yml b/ansible/roles/system-init-7400-mcn0/tasks/main.yml index 4b234762..210a1ab4 100644 --- a/ansible/roles/system-init-7400-mcn0/tasks/main.yml +++ b/ansible/roles/system-init-7400-mcn0/tasks/main.yml @@ -67,64 +67,64 @@ # systemctl set-property workload.slice CPUShares=7500 MemoryLimit=99G # workload.slice -- name: "Create /etc/systemd/system/workload.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/workload.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/workload.slice.d/ + - /usr/lib/systemd/system/workload.slice.d/ - name: "copy 50-CPUShares.conf to workload.slice.d" copy: src: "{{ role_path }}/templates/override_workload_slice_cpu.conf.j2" - dest: /etc/systemd/system/workload.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/workload.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to workload.slice.d" copy: src: "{{ role_path }}/templates/override_workload_slice_mem.conf.j2" - dest: /etc/systemd/system/workload.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/workload.slice.d/50-MemoryLimit.conf mode: 0644 # user.slice -- name: "Create /etc/systemd/system/user.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/user.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/user.slice.d/ + - /usr/lib/systemd/system/user.slice.d/ - name: "copy 50-CPUShares.conf to user.slice.d" copy: src: "{{ role_path }}/templates/override_user_slice_cpu.conf.j2" - dest: /etc/systemd/system/user.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/user.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to user.slice.d" copy: src: "{{ role_path }}/templates/override_user_slice_mem.conf.j2" - dest: /etc/systemd/system/user.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/user.slice.d/50-MemoryLimit.conf mode: 0644 # system.slice -- name: "Create /etc/systemd/system/system.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/system.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/system.slice.d/ + - /usr/lib/systemd/system/system.slice.d/ - name: "copy 50-CPUShares.conf to system.slice.d" copy: src: "{{ role_path }}/templates/override_system_slice_cpu.conf.j2" - dest: /etc/systemd/system/system.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/system.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to system.slice.d" copy: src: "{{ role_path }}/templates/override_system_slice_mem.conf.j2" - dest: /etc/systemd/system/system.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/system.slice.d/50-MemoryLimit.conf mode: 0644 diff --git a/ansible/roles/system-init-7400-mcn123/tasks/main.yml b/ansible/roles/system-init-7400-mcn123/tasks/main.yml index ede05e3c..ff00c407 100644 --- a/ansible/roles/system-init-7400-mcn123/tasks/main.yml +++ b/ansible/roles/system-init-7400-mcn123/tasks/main.yml @@ -67,64 +67,64 @@ # systemctl set-property workload.slice CPUShares=7500 MemoryLimit=99G # workload.slice -- name: "Create /etc/systemd/system/workload.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/workload.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/workload.slice.d/ + - /usr/lib/systemd/system/workload.slice.d/ - name: "copy 50-CPUShares.conf to workload.slice.d" copy: src: "{{ role_path }}/templates/override_workload_slice_cpu.conf.j2" - dest: /etc/systemd/system/workload.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/workload.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to workload.slice.d" copy: src: "{{ role_path }}/templates/override_workload_slice_mem.conf.j2" - dest: /etc/systemd/system/workload.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/workload.slice.d/50-MemoryLimit.conf mode: 0644 # user.slice -- name: "Create /etc/systemd/system/user.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/user.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/user.slice.d/ + - /usr/lib/systemd/system/user.slice.d/ - name: "copy 50-CPUShares.conf to user.slice.d" copy: src: "{{ role_path }}/templates/override_user_slice_cpu.conf.j2" - dest: /etc/systemd/system/user.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/user.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to user.slice.d" copy: src: "{{ role_path }}/templates/override_user_slice_mem.conf.j2" - dest: /etc/systemd/system/user.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/user.slice.d/50-MemoryLimit.conf mode: 0644 # system.slice -- name: "Create /etc/systemd/system/system.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/system.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/system.slice.d/ + - /usr/lib/systemd/system/system.slice.d/ - name: "copy 50-CPUShares.conf to system.slice.d" copy: src: "{{ role_path }}/templates/override_system_slice_cpu.conf.j2" - dest: /etc/systemd/system/system.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/system.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to system.slice.d" copy: src: "{{ role_path }}/templates/override_system_slice_mem.conf.j2" - dest: /etc/systemd/system/system.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/system.slice.d/50-MemoryLimit.conf mode: 0644 \ No newline at end of file diff --git a/ansible/roles/system-init-9140/tasks/main.yml b/ansible/roles/system-init-9140/tasks/main.yml index ebdcc27b..af1d4cc2 100644 --- a/ansible/roles/system-init-9140/tasks/main.yml +++ b/ansible/roles/system-init-9140/tasks/main.yml @@ -136,66 +136,66 @@ # systemctl set-property workload.slice CPUShares=7500 MemoryLimit=100G # workload.slice -- name: "Create /etc/systemd/system/workload.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/workload.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/workload.slice.d/ + - /usr/lib/systemd/system/workload.slice.d/ - name: "copy 50-CPUShares.conf to workload.slice.d" copy: src: "{{ role_path }}/templates/override_workload_slice_cpu.conf.j2" - dest: /etc/systemd/system/workload.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/workload.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to workload.slice.d" copy: src: "{{ role_path }}/templates/override_workload_slice_mem.conf.j2" - dest: /etc/systemd/system/workload.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/workload.slice.d/50-MemoryLimit.conf mode: 0644 # user.slice -- name: "Create /etc/systemd/system/user.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/user.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/user.slice.d/ + - /usr/lib/systemd/system/user.slice.d/ - name: "copy 50-CPUShares.conf to user.slice.d" copy: src: "{{ role_path }}/templates/override_user_slice_cpu.conf.j2" - dest: /etc/systemd/system/user.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/user.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to user.slice.d" copy: src: "{{ role_path }}/templates/override_user_slice_mem.conf.j2" - dest: /etc/systemd/system/user.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/user.slice.d/50-MemoryLimit.conf mode: 0644 # system.slice -- name: "Create /etc/systemd/system/system.slice.d/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/system.slice.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/systemd/system/system.slice.d/ + - /usr/lib/systemd/system/system.slice.d/ - name: "copy 50-CPUShares.conf to system.slice.d" copy: src: "{{ role_path }}/templates/override_system_slice_cpu.conf.j2" - dest: /etc/systemd/system/system.slice.d/50-CPUShares.conf + dest: /usr/lib/systemd/system/system.slice.d/50-CPUShares.conf mode: 0644 - name: "copy 50-MemoryLimit.conf to system.slice.d" copy: src: "{{ role_path }}/templates/override_system_slice_mem.conf.j2" - dest: /etc/systemd/system/system.slice.d/50-MemoryLimit.conf + dest: /usr/lib/systemd/system/system.slice.d/50-MemoryLimit.conf mode: 0644 # 启用 IPMI