Fabian Deutsch has uploaded a new change for review. Change subject: service: All services must be started before vdsm ......................................................................
service: All services must be started before vdsm We need to ensure that all node related services are started before vdsm, to prevent configuration races between node and vdsm. Change-Id: I6b44fa6eefb12c226598835c88d16a4c5cc7aa7b Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1156369 Signed-off-by: Fabian Deutsch <[email protected]> --- M services/ovirt-awake.service M services/ovirt-cim.service M services/ovirt-early.service M services/ovirt-firstboot.service M services/ovirt-kdump.service M services/ovirt-post.service M services/ovirt.service 7 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/12/34812/1 diff --git a/services/ovirt-awake.service b/services/ovirt-awake.service index 26da10e..c597dec 100644 --- a/services/ovirt-awake.service +++ b/services/ovirt-awake.service @@ -1,6 +1,7 @@ [Unit] Description=oVirt Node management server alert service After=ovirt-early.service ovirt-firstboot.service +Before=vdsmd.service supervdsmd.service Wants=ovirt-early.service [Service] diff --git a/services/ovirt-cim.service b/services/ovirt-cim.service index 9889fe1..b2383f3 100644 --- a/services/ovirt-cim.service +++ b/services/ovirt-cim.service @@ -1,6 +1,7 @@ [Unit] Description=oVirt Node CIM configuration service After=ovirt-post.service ovirt-firstboot.service +Before=vdsmd.service supervdsmd.service Wants=ovirt-post.service [Service] diff --git a/services/ovirt-early.service b/services/ovirt-early.service index d79ad25..e2ef900 100644 --- a/services/ovirt-early.service +++ b/services/ovirt-early.service @@ -2,7 +2,8 @@ Description=oVirt Node early configuration service After=rhel-readonly.service fedora-readonly.service local-fs.target network.target Wants=rhel-readonly.service fedora-readonly.service local-fs.target -Before=sshd.service rsyslog.service +Before=sshd.service rsyslog.service sanlock.service +Before=vdsmd.service supervdsmd.service [Service] Type=oneshot diff --git a/services/ovirt-firstboot.service b/services/ovirt-firstboot.service index 13ba179..005ecfc 100644 --- a/services/ovirt-firstboot.service +++ b/services/ovirt-firstboot.service @@ -3,6 +3,7 @@ After=ovirt-early.service [email protected] [email protected] [email protected] [email protected] [email protected] Before=rc-local.service +Before=vdsmd.service supervdsmd.service [Service] Environment=RUNLEVEL=3 diff --git a/services/ovirt-kdump.service b/services/ovirt-kdump.service index e467593..079a7d6 100644 --- a/services/ovirt-kdump.service +++ b/services/ovirt-kdump.service @@ -1,6 +1,7 @@ [Unit] Description=oVirt Node kdump service After=network.target ovirt-early.service +Before=vdsmd.service supervdsmd.service [Service] Type=oneshot diff --git a/services/ovirt-post.service b/services/ovirt-post.service index cf66e81..50e81bd 100644 --- a/services/ovirt-post.service +++ b/services/ovirt-post.service @@ -2,7 +2,8 @@ Description=oVirt Node post configuration service After=ovirt.service ovirt-firstboot.service Wants=ovirt.service [email protected] vdsmd.service supervdsmd.service sanlock.service [email protected] sanlock.service +Before=vdsmd.service supervdsmd.service [Service] Type=oneshot diff --git a/services/ovirt.service b/services/ovirt.service index ec2fa2d..06af440 100644 --- a/services/ovirt.service +++ b/services/ovirt.service @@ -1,6 +1,8 @@ [Unit] Description=oVirt Node managed/standalone configuration service After=ovirt-awake.service ovirt-firstboot.service +Before=sanlock.service +Before=vdsmd.service supervdsmd.service Wants=ovirt-awake.service [Service] -- To view, visit http://gerrit.ovirt.org/34812 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b44fa6eefb12c226598835c88d16a4c5cc7aa7b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
