Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Systemd drop-in permission fixes + disable cloud-init related drop-ins on Flatcar #1093

Merged
merged 2 commits into from
Mar 7, 2023
Merged

Systemd drop-in permission fixes + disable cloud-init related drop-ins on Flatcar #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e19a1b
Fix permissions on systemd drop-ins
hrak Mar 3, 2023
55516cd
Disable cloud-final and cloud-config drop-ins for Flatcar
hrak Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion images/capi/ansible/roles/node/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 7 additions & 3 deletions images/capi/ansible/roles/providers/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down