Hi Jun, Thanks for your feedback and apologies for the late reply.
On 11:20 Sun 10 Aug , Jun Futagawa wrote: > systemd refuses ganeti-common.service start request repeated too > quickly. This patch fixes it. I will try to reproduce this in my setup. ganeti-common.service is required and run on purpose before all daemons, so removing these dependencies is not the right solution. Also see inline for some comments. > > Signed-off-by: Jun Futagawa <[email protected]> > --- > doc/examples/systemd/ganeti-kvmd.service.in | 2 -- > doc/examples/systemd/ganeti-luxid.service.in | 2 -- > doc/examples/systemd/ganeti-metad.service.in | 2 -- > doc/examples/systemd/ganeti-mond.service.in | 2 -- > doc/examples/systemd/ganeti-noded.service.in | 4 ++-- > doc/examples/systemd/ganeti-rapi.service.in | 4 +--- > doc/examples/systemd/ganeti-wconfd.service.in | 2 -- > 7 files changed, 3 insertions(+), 15 deletions(-) > > diff --git a/doc/examples/systemd/ganeti-kvmd.service.in > b/doc/examples/systemd/ganeti-kvmd.service.in > index 2bc7dd6..7e31fef 100644 > --- a/doc/examples/systemd/ganeti-kvmd.service.in > +++ b/doc/examples/systemd/ganeti-kvmd.service.in > @@ -1,8 +1,6 @@ > [Unit] > Description = Ganeti KVM daemon (kvmd) > Documentation = man:ganeti-kvmd(8) > -Requires = ganeti-common.service > -After = ganeti-common.service > PartOf = ganeti-noded.target > > [Service] > diff --git a/doc/examples/systemd/ganeti-luxid.service.in > b/doc/examples/systemd/ganeti-luxid.service.in > index 2fbcb4a..56881f1 100644 > --- a/doc/examples/systemd/ganeti-luxid.service.in > +++ b/doc/examples/systemd/ganeti-luxid.service.in > @@ -1,8 +1,6 @@ > [Unit] > Description = Ganeti query daemon (luxid) > Documentation = man:ganeti-luxid(8) > -Requires = ganeti-common.service > -After = ganeti-common.service > PartOf = ganeti-master.target > ConditionPathExists = @LOCALSTATEDIR@/lib/ganeti/config.data > > diff --git a/doc/examples/systemd/ganeti-metad.service.in > b/doc/examples/systemd/ganeti-metad.service.in > index 30950dc..6698838 100644 > --- a/doc/examples/systemd/ganeti-metad.service.in > +++ b/doc/examples/systemd/ganeti-metad.service.in > @@ -1,7 +1,5 @@ > [Unit] > Description = Ganeti instance metadata daemon (metad) > -Requires = ganeti-common.service > -After = ganeti-common.service > PartOf = ganeti-noded.target > > [Service] > diff --git a/doc/examples/systemd/ganeti-mond.service.in > b/doc/examples/systemd/ganeti-mond.service.in > index bca40d4..63aef10 100644 > --- a/doc/examples/systemd/ganeti-mond.service.in > +++ b/doc/examples/systemd/ganeti-mond.service.in > @@ -1,8 +1,6 @@ > [Unit] > Description = Ganeti monitoring daemon (mond) > Documentation = man:ganeti-mond(8) > -Requires = ganeti-common.service > -After = ganeti-common.service > PartOf = ganeti-node.target > > [Service] > diff --git a/doc/examples/systemd/ganeti-noded.service.in > b/doc/examples/systemd/ganeti-noded.service.in > index 605e3f5..ce8ca6a 100644 > --- a/doc/examples/systemd/ganeti-noded.service.in > +++ b/doc/examples/systemd/ganeti-noded.service.in > @@ -1,8 +1,8 @@ > [Unit] > Description = Ganeti node daemon (noded) > Documentation = man:ganeti-noded(8) > -After = ganeti-common.service > -Requires = ganeti-common.service > +Requires = ganeti-confd.service > +After = ganeti-confd.service This is an unrelated change. > PartOf = ganeti-node.target > ConditionPathExists = @LOCALSTATEDIR@/lib/ganeti/server.pem > > diff --git a/doc/examples/systemd/ganeti-rapi.service.in > b/doc/examples/systemd/ganeti-rapi.service.in > index a2ce1f5..961df0f 100644 > --- a/doc/examples/systemd/ganeti-rapi.service.in > +++ b/doc/examples/systemd/ganeti-rapi.service.in > @@ -1,9 +1,7 @@ > [Unit] > Description = Ganeti RAPI daemon (rapi) > Documentation = man:ganeti-rapi(8) > -Requires = ganeti-common.service > -Requisite = ganeti-luxid.service > -After = ganeti-common.service > +Requires = ganeti-luxid.service > PartOf = ganeti-master.target > ConditionPathExists = @LOCALSTATEDIR@/lib/ganeti/rapi.pem This is also an unrelated change. > > diff --git a/doc/examples/systemd/ganeti-wconfd.service.in > b/doc/examples/systemd/ganeti-wconfd.service.in > index 762c4f3..99a1671 100644 > --- a/doc/examples/systemd/ganeti-wconfd.service.in > +++ b/doc/examples/systemd/ganeti-wconfd.service.in > @@ -1,8 +1,6 @@ > [Unit] > Description = Ganeti config writer daemon (wconfd) > Documentation = man:ganeti-wconfd(8) > -Requires = ganeti-common.service > -After = ganeti-common.service > PartOf = ganeti-master.target > ConditionPathExists = @LOCALSTATEDIR@/lib/ganeti/config.data > > -- > 1.8.3.1 > Cheers, Apollon
