]>
Commit | Line | Data |
---|---|---|
1 | http://code.google.com/p/ganeti/issues/detail?id=444 | |
2 | ||
3 | --- ganeti-2.6.2/Makefile.am~ 2012-12-21 15:38:52.000000000 +0100 | |
4 | +++ ganeti-2.6.2/Makefile.am 2013-06-01 16:01:46.594026366 +0200 | |
5 | @@ -149,6 +149,7 @@ | |
6 | $(BUILT_EXAMPLES) \ | |
7 | doc/examples/bash_completion \ | |
8 | doc/examples/bash_completion-debug \ | |
9 | + doc/examples/ganeti.target \ | |
10 | $(userspecs) \ | |
11 | lib/_generated_rpc.py \ | |
12 | $(man_MANS) \ | |
13 | @@ -190,7 +190,13 @@ | |
14 | doc/examples/ganeti.cron \ | |
15 | doc/examples/ganeti.initd \ | |
16 | doc/examples/gnt-config-backup \ | |
17 | - doc/examples/hooks/ipsec | |
18 | + doc/examples/hooks/ipsec \ | |
19 | + doc/examples/ganeti-confd.service \ | |
20 | + doc/examples/ganeti-masterd.service \ | |
21 | + doc/examples/ganeti-noded.service \ | |
22 | + doc/examples/ganeti-luxid.service \ | |
23 | + doc/examples/ganeti-mond.service \ | |
24 | + doc/examples/ganeti-rapi.service | |
25 | ||
26 | nodist_pkgpython_PYTHON = \ | |
27 | $(BUILT_PYTHON_SOURCES) | |
28 | --- ganeti-2.6.2/doc/examples.orig/ganeti-confd.service.in 1970-01-01 01:00:00.000000000 +0100 | |
29 | +++ ganeti-2.6.2/doc/examples/ganeti-confd.service.in 2013-06-01 15:55:37.594893846 +0200 | |
30 | @@ -0,0 +1,18 @@ | |
31 | +[Unit] | |
32 | +Description=Ganeti Confd | |
33 | +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service | |
34 | +After=ganeti-rapi.service | |
35 | +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem | |
36 | + | |
37 | +[Service] | |
38 | +Type=forking | |
39 | +EnvironmentFile=-/etc/sysconfig/ganeti | |
40 | +ExecStartPre=@PKGLIBDIR@/ensure-dirs | |
41 | +ExecStart=@PREFIX@/sbin/ganeti-confd $CONFD_ARGS | |
42 | +User=@GNTCONFDUSER@ | |
43 | +Group=@GNTCONFDGROUP@ | |
44 | +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-confd.pid | |
45 | +KillMode=process | |
46 | + | |
47 | +[Install] | |
48 | +WantedBy=ganeti.target | |
49 | --- ganeti-2.6.2/doc/examples.orig/ganeti-masterd.service.in 1970-01-01 01:00:00.000000000 +0100 | |
50 | +++ ganeti-2.6.2/doc/examples/ganeti-masterd.service.in 2013-06-01 15:55:37.611560663 +0200 | |
51 | @@ -0,0 +1,19 @@ | |
52 | +[Unit] | |
53 | +Description=Ganeti Masterd | |
54 | +Requires=ganeti-noded.service | |
55 | +After=ganeti-noded.service | |
56 | +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem | |
57 | + | |
58 | +[Service] | |
59 | +Type=forking | |
60 | +EnvironmentFile=-/etc/sysconfig/ganeti | |
61 | +ExecStartPre=@PKGLIBDIR@/ensure-dirs | |
62 | +ExecStart=@PREFIX@/sbin/ganeti-masterd $MASTERD_ARGS | |
63 | +User=@GNTMASTERUSER@ | |
64 | +Group=@GNTMASTERDGROUP@ | |
65 | +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-masterd.pid | |
66 | +# TODO: Should KillMode be process? | |
67 | +KillMode=control-group | |
68 | + | |
69 | +[Install] | |
70 | +WantedBy=ganeti.target | |
71 | --- ganeti-2.6.2/doc/examples.orig/ganeti-noded.service.in 1970-01-01 01:00:00.000000000 +0100 | |
72 | +++ ganeti-2.6.2/doc/examples/ganeti-noded.service.in 2013-06-01 15:55:37.631560853 +0200 | |
73 | @@ -0,0 +1,16 @@ | |
74 | +[Unit] | |
75 | +Description=Ganeti Noded | |
76 | +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem | |
77 | + | |
78 | +[Service] | |
79 | +Type=forking | |
80 | +EnvironmentFile=-/etc/sysconfig/ganeti | |
81 | +ExecStartPre=@PKGLIBDIR@/ensure-dirs | |
82 | +ExecStart=@PREFIX@/sbin/ganeti-noded $NODED_ARGS | |
83 | +User=@GNTNODEDUSER@ | |
84 | +Group=@GNTDAEMONSGROUP@ | |
85 | +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-noded.pid | |
86 | +KillMode=control-group | |
87 | + | |
88 | +[Install] | |
89 | +WantedBy=ganeti.target | |
90 | --- ganeti-2.6.2/doc/examples.orig/ganeti-rapi.service.in 1970-01-01 01:00:00.000000000 +0100 | |
91 | +++ ganeti-2.6.2/doc/examples/ganeti-rapi.service.in 2013-06-01 15:55:37.644894309 +0200 | |
92 | @@ -0,0 +1,18 @@ | |
93 | +[Unit] | |
94 | +Description=Ganeti RAPI | |
95 | +Requires=ganeti-noded.service ganeti-masterd.service | |
96 | +After=ganeti-masterd.service | |
97 | +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem | |
98 | + | |
99 | +[Service] | |
100 | +Type=forking | |
101 | +EnvironmentFile=-/etc/sysconfig/ganeti | |
102 | +ExecStartPre=@PKGLIBDIR@/ensure-dirs | |
103 | +ExecStart=@PREFIX@/sbin/ganeti-rapi $RAPI_ARGS | |
104 | +User=@GNTRAPIUSER@ | |
105 | +Group=@GNTRAPIGROUP@ | |
106 | +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-rapi.pid | |
107 | +KillMode=process | |
108 | + | |
109 | +[Install] | |
110 | +WantedBy=ganeti.target | |
111 | --- ganeti-2.6.2/doc/examples.orig/ganeti-luxid.service.in 1970-01-01 01:00:00.000000000 +0100 | |
112 | +++ ganeti-2.6.2/doc/examples/ganeti-luxid.service.in 2013-06-01 15:55:37.594893846 +0200 | |
113 | @@ -0,0 +1,18 @@ | |
114 | +[Unit] | |
115 | +Description=Ganeti luxid | |
116 | +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service | |
117 | +After=ganeti-rapi.service | |
118 | +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem | |
119 | + | |
120 | +[Service] | |
121 | +Type=forking | |
122 | +EnvironmentFile=-/etc/sysconfig/ganeti | |
123 | +ExecStartPre=@PKGLIBDIR@/ensure-dirs | |
124 | +ExecStart=@PREFIX@/sbin/ganeti-luxid $LUXID_ARGS | |
125 | +User=@GNTLUXIDUSER@ | |
126 | +Group=@GNTLUXIDGROUP@ | |
127 | +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-luxid.pid | |
128 | +KillMode=process | |
129 | + | |
130 | +[Install] | |
131 | +WantedBy=ganeti.target | |
132 | --- ganeti-2.6.2/doc/examples.orig/ganeti-mond.service.in 1970-01-01 01:00:00.000000000 +0100 | |
133 | +++ ganeti-2.6.2/doc/examples/ganeti-mond.service.in 2013-06-01 15:55:37.594893846 +0200 | |
134 | @@ -0,0 +1,18 @@ | |
135 | +[Unit] | |
136 | +Description=Ganeti mond | |
137 | +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service | |
138 | +After=ganeti-rapi.service | |
139 | +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem | |
140 | + | |
141 | +[Service] | |
142 | +Type=forking | |
143 | +EnvironmentFile=-/etc/sysconfig/ganeti | |
144 | +ExecStartPre=@PKGLIBDIR@/ensure-dirs | |
145 | +ExecStart=@PREFIX@/sbin/ganeti-mond $MOND_ARGS | |
146 | +User=@GNTMONDUSER@ | |
147 | +Group=@GNTMONDGROUP@ | |
148 | +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-mond.pid | |
149 | +KillMode=process | |
150 | + | |
151 | +[Install] | |
152 | +WantedBy=ganeti.target | |
153 | --- ganeti-2.6.2/doc/examples.orig/ganeti.target 1970-01-01 01:00:00.000000000 +0100 | |
154 | +++ ganeti-2.6.2/doc/examples/ganeti.target 2013-06-01 15:55:37.661561129 +0200 | |
155 | @@ -0,0 +1,5 @@ | |
156 | +[Unit] | |
157 | +Description=Ganeti | |
158 | + | |
159 | +[Install] | |
160 | +WantedBy=multi-user.target | |
161 | --- ganeti-2.6.2/doc/examples.orig/README.systemd 1970-01-01 01:00:00.000000000 +0100 | |
162 | +++ ganeti-2.6.2/doc/examples/README.systemd 2013-06-01 15:55:37.661561129 +0200 | |
163 | @@ -0,0 +1,14 @@ | |
164 | +To register the services with ganeti.target (order doesn't matter): | |
165 | + | |
166 | + systemctl enable ganeti-noded ganeti-masterd ganeti-rapi | |
167 | + | |
168 | +To include confd: | |
169 | + | |
170 | + systemctl enable ganeti-confd | |
171 | + | |
172 | +To signal to the ganeti target that it should start at boot: | |
173 | + | |
174 | + systemctl enable ganeti.target | |
175 | + | |
176 | +Note that the files aren't at all tested beyond just being able to start the | |
177 | +daemons. I don't have Ganeti running yet, so I can't test stopping. |