Merge pull request #1093 from hrak/systemd_fixes

Systemd drop-in permission fixes + disable cloud-init related drop-ins on Flatcar
kubernetes-sigs · Mar 7, 2023 · de1b85a · de1b85a
2 parents 6e7fa1e + 55516cd
commit de1b85a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/images/capi/ansible/roles/node/tasks/main.yml b/images/capi/ansible/roles/node/tasks/main.yml
@@ -124,7 +124,7 @@
   template:
     src: etc/udev/rules.d/90-etcd-tuning.rules
     dest: /etc/udev/rules.d/90-etcd-tuning.rules
-    mode: 0744
+    mode: 0644
 
 - name: Copy etcd network tuning script
   copy:

diff --git a/images/capi/ansible/roles/providers/tasks/main.yml b/images/capi/ansible/roles/providers/tasks/main.yml
@@ -54,27 +54,31 @@
   file:
     path: /etc/systemd/system/cloud-final.service.d
     state: directory
+  when: ansible_os_family != "Flatcar"
 
 - name: Create cloud-final boot order drop in file
   copy:
     dest: /etc/systemd/system/cloud-final.service.d/boot-order.conf
     src: etc/systemd/system/cloud-final.service.d/boot-order.conf
     owner: root
     group: root
-    mode: "0755"
+    mode: "0644"
+  when: ansible_os_family != "Flatcar"
 
 - name: Creates unit file directory for cloud-config
   file:
     path: /etc/systemd/system/cloud-config.service.d
     state: directory
+  when: ansible_os_family != "Flatcar"
 
-- name: Create cloud-final boot order drop in file
+- name: Create cloud-config boot order drop in file
   copy:
     dest: /etc/systemd/system/cloud-config.service.d/boot-order.conf
     src: etc/systemd/system/cloud-config.service.d/boot-order.conf
     owner: root
     group: root
-    mode: "0755"
+    mode: "0644"
+  when: ansible_os_family != "Flatcar"
 
 # Some OS might disable cloud-final service on boot (rhel 7).
 # Enable all cloud-init services on boot.