Skip to content

Bug 1838984: [release-4.3] templates: Don't enable machine-config-daemon-host.service by default #1747

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

Merged
openshift-merge-robot merged 1 commit into from
May 29, 2020
Merged

Bug 1838984: [release-4.3] templates: Don't enable machine-config-daemon-host.service by default #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions templates/common/_base/units/machine-config-daemon-firstboot-v42.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: "machine-config-daemon-firstboot-v42.service"
enabled: true
contents: |
[Unit]
Description=Machine Config Daemon Firstboot (4.2 bootimage)
# Make sure it runs only on OSTree booted system
ConditionPathExists=/run/ostree-booted
BindsTo=ignition-firstboot-complete.service
ConditionPathExists=/etc/ignition-machine-config-encapsulated.json
# Note the opposite of this in machine-config-daemon-firstboot
ConditionPathExists=!/sysroot/.coreos-aleph-version.json
After=ignition-firstboot-complete.service
Before=kubelet.service

[Service]
# Need oneshot to delay kubelet
Type=oneshot
ExecStart=/usr/libexec/machine-config-daemon pivot

[Install]
WantedBy=multi-user.target
3 changes: 3 additions & 0 deletions templates/common/_base/units/machine-config-daemon-firstboot.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ contents: |
ConditionPathExists=/run/ostree-booted
BindsTo=ignition-firstboot-complete.service
ConditionPathExists=/etc/ignition-machine-config-encapsulated.json
# We only want to run on 4.3 clusters and above; this came from
# https://github.com/coreos/coreos-assembler/pull/768
ConditionPathExists=/sysroot/.coreos-aleph-version.json
After=ignition-firstboot-complete.service
Before=kubelet.service

Expand Down
2 changes: 1 addition & 1 deletion templates/common/_base/units/machine-config-daemon-host.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "machine-config-daemon-host.service"
enabled: true
enabled: false
contents: |
[Unit]
Description=Machine Config Daemon Initial
Expand Down