1 |
commit: 533097a2ef4a441e445bb2feac0ed8e4d5ba1cac |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Mar 30 10:25:22 2022 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Mar 30 10:26:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=533097a2 |
7 |
|
8 |
sys-cluster/nova: units, tmpfile, logrotate |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
sys-cluster/nova/files/nova.logrotate | 7 +++++++ |
13 |
sys-cluster/nova/files/nova.tmpfile | 1 + |
14 |
sys-cluster/nova/files/openstack-nova-api.service | 15 +++++++++++++++ |
15 |
.../nova/files/openstack-nova-compute.service | 16 ++++++++++++++++ |
16 |
.../nova/files/openstack-nova-conductor.service | 15 +++++++++++++++ |
17 |
.../nova/files/openstack-nova-metadata-api.service | 15 +++++++++++++++ |
18 |
.../nova/files/openstack-nova-novncproxy.service | 13 +++++++++++++ |
19 |
.../files/openstack-nova-os-compute-api.service | 14 ++++++++++++++ |
20 |
.../nova/files/openstack-nova-scheduler.service | 15 +++++++++++++++ |
21 |
....0_rc1-r2.ebuild => nova-25.0.0.0_rc1-r3.ebuild} | 21 +++++++++++++-------- |
22 |
10 files changed, 124 insertions(+), 8 deletions(-) |
23 |
|
24 |
diff --git a/sys-cluster/nova/files/nova.logrotate b/sys-cluster/nova/files/nova.logrotate |
25 |
new file mode 100644 |
26 |
index 000000000..51c7caf73 |
27 |
--- /dev/null |
28 |
+++ b/sys-cluster/nova/files/nova.logrotate |
29 |
@@ -0,0 +1,7 @@ |
30 |
+/var/log/nova/*.log { |
31 |
+ daily |
32 |
+ missingok |
33 |
+ compress |
34 |
+ delaycompress |
35 |
+ copytruncate |
36 |
+} |
37 |
|
38 |
diff --git a/sys-cluster/nova/files/nova.tmpfile b/sys-cluster/nova/files/nova.tmpfile |
39 |
new file mode 100644 |
40 |
index 000000000..126845d14 |
41 |
--- /dev/null |
42 |
+++ b/sys-cluster/nova/files/nova.tmpfile |
43 |
@@ -0,0 +1 @@ |
44 |
+d /run/nova 0755 nova nova - |
45 |
|
46 |
diff --git a/sys-cluster/nova/files/openstack-nova-api.service b/sys-cluster/nova/files/openstack-nova-api.service |
47 |
new file mode 100644 |
48 |
index 000000000..9c83f6da4 |
49 |
--- /dev/null |
50 |
+++ b/sys-cluster/nova/files/openstack-nova-api.service |
51 |
@@ -0,0 +1,15 @@ |
52 |
+[Unit] |
53 |
+Description=OpenStack Nova API Server |
54 |
+After=syslog.target network.target |
55 |
+ |
56 |
+[Service] |
57 |
+Type=notify |
58 |
+NotifyAccess=all |
59 |
+TimeoutStartSec=0 |
60 |
+Restart=always |
61 |
+User=nova |
62 |
+ExecStart=/usr/bin/nova-api --log-file /var/log/nova/api.log |
63 |
+ |
64 |
+[Install] |
65 |
+WantedBy=multi-user.target |
66 |
+ |
67 |
|
68 |
diff --git a/sys-cluster/nova/files/openstack-nova-compute.service b/sys-cluster/nova/files/openstack-nova-compute.service |
69 |
new file mode 100644 |
70 |
index 000000000..1e1f1b4dd |
71 |
--- /dev/null |
72 |
+++ b/sys-cluster/nova/files/openstack-nova-compute.service |
73 |
@@ -0,0 +1,16 @@ |
74 |
+[Unit] |
75 |
+Description=OpenStack Nova Compute Server |
76 |
+After=syslog.target network.target libvirtd.service virtqemud.service |
77 |
+ |
78 |
+[Service] |
79 |
+Environment=LIBGUESTFS_ATTACH_METHOD=appliance |
80 |
+Type=notify |
81 |
+NotifyAccess=all |
82 |
+TimeoutStartSec=0 |
83 |
+Restart=always |
84 |
+User=nova |
85 |
+ExecStart=/usr/bin/nova-compute --log-file /var/log/nova/compute.log |
86 |
+ |
87 |
+[Install] |
88 |
+WantedBy=multi-user.target |
89 |
+ |
90 |
|
91 |
diff --git a/sys-cluster/nova/files/openstack-nova-conductor.service b/sys-cluster/nova/files/openstack-nova-conductor.service |
92 |
new file mode 100644 |
93 |
index 000000000..bca3c738e |
94 |
--- /dev/null |
95 |
+++ b/sys-cluster/nova/files/openstack-nova-conductor.service |
96 |
@@ -0,0 +1,15 @@ |
97 |
+[Unit] |
98 |
+Description=OpenStack Nova Conductor Server |
99 |
+After=syslog.target network.target |
100 |
+ |
101 |
+[Service] |
102 |
+Type=notify |
103 |
+NotifyAccess=all |
104 |
+TimeoutStartSec=0 |
105 |
+Restart=always |
106 |
+User=nova |
107 |
+ExecStart=/usr/bin/nova-conductor --log-file /var/log/nova/conductor.log |
108 |
+ |
109 |
+[Install] |
110 |
+WantedBy=multi-user.target |
111 |
+ |
112 |
|
113 |
diff --git a/sys-cluster/nova/files/openstack-nova-metadata-api.service b/sys-cluster/nova/files/openstack-nova-metadata-api.service |
114 |
new file mode 100644 |
115 |
index 000000000..6885b682c |
116 |
--- /dev/null |
117 |
+++ b/sys-cluster/nova/files/openstack-nova-metadata-api.service |
118 |
@@ -0,0 +1,15 @@ |
119 |
+[Unit] |
120 |
+Description=OpenStack Nova Metadata API Server |
121 |
+After=syslog.target network.target |
122 |
+ |
123 |
+[Service] |
124 |
+Type=notify |
125 |
+NotifyAccess=all |
126 |
+TimeoutStartSec=0 |
127 |
+Restart=always |
128 |
+User=nova |
129 |
+ExecStart=/usr/bin/nova-api-metadata --log-file /var/log/nova/metadata.log |
130 |
+ |
131 |
+[Install] |
132 |
+WantedBy=multi-user.target |
133 |
+ |
134 |
|
135 |
diff --git a/sys-cluster/nova/files/openstack-nova-novncproxy.service b/sys-cluster/nova/files/openstack-nova-novncproxy.service |
136 |
new file mode 100644 |
137 |
index 000000000..648aab89f |
138 |
--- /dev/null |
139 |
+++ b/sys-cluster/nova/files/openstack-nova-novncproxy.service |
140 |
@@ -0,0 +1,13 @@ |
141 |
+[Unit] |
142 |
+Description=OpenStack Nova NoVNC Proxy Server |
143 |
+After=syslog.target network.target |
144 |
+ |
145 |
+[Service] |
146 |
+Type=simple |
147 |
+User=nova |
148 |
+EnvironmentFile=-/etc/conf.d/openstack-nova-novncproxy |
149 |
+ExecStart=/usr/bin/nova-novncproxy --web /usr/share/webapps/novnc/ --log-file /var/log/nova/novnc.log $OPTIONS |
150 |
+Restart=on-failure |
151 |
+ |
152 |
+[Install] |
153 |
+WantedBy=multi-user.target |
154 |
|
155 |
diff --git a/sys-cluster/nova/files/openstack-nova-os-compute-api.service b/sys-cluster/nova/files/openstack-nova-os-compute-api.service |
156 |
new file mode 100644 |
157 |
index 000000000..0720a5221 |
158 |
--- /dev/null |
159 |
+++ b/sys-cluster/nova/files/openstack-nova-os-compute-api.service |
160 |
@@ -0,0 +1,14 @@ |
161 |
+[Unit] |
162 |
+Description=OpenStack Nova Compute API Server |
163 |
+After=syslog.target network.target |
164 |
+ |
165 |
+[Service] |
166 |
+Type=notify |
167 |
+NotifyAccess=all |
168 |
+TimeoutStartSec=0 |
169 |
+Restart=always |
170 |
+User=nova |
171 |
+ExecStart=/usr/bin/nova-api-os-compute --log-file /var/log/nova/api-os-compute.log |
172 |
+ |
173 |
+[Install] |
174 |
+WantedBy=multi-user.target |
175 |
|
176 |
diff --git a/sys-cluster/nova/files/openstack-nova-scheduler.service b/sys-cluster/nova/files/openstack-nova-scheduler.service |
177 |
new file mode 100644 |
178 |
index 000000000..14e30fe7c |
179 |
--- /dev/null |
180 |
+++ b/sys-cluster/nova/files/openstack-nova-scheduler.service |
181 |
@@ -0,0 +1,15 @@ |
182 |
+[Unit] |
183 |
+Description=OpenStack Nova Scheduler Server |
184 |
+After=syslog.target network.target |
185 |
+ |
186 |
+[Service] |
187 |
+Type=notify |
188 |
+NotifyAccess=all |
189 |
+TimeoutStartSec=0 |
190 |
+Restart=always |
191 |
+User=nova |
192 |
+ExecStart=/usr/bin/nova-scheduler --log-file /var/log/nova/scheduler.log |
193 |
+ |
194 |
+[Install] |
195 |
+WantedBy=multi-user.target |
196 |
+ |
197 |
|
198 |
diff --git a/sys-cluster/nova/nova-25.0.0.0_rc1-r2.ebuild b/sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild |
199 |
similarity index 93% |
200 |
rename from sys-cluster/nova/nova-25.0.0.0_rc1-r2.ebuild |
201 |
rename to sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild |
202 |
index 899369c6f..3ae0f19aa 100644 |
203 |
--- a/sys-cluster/nova/nova-25.0.0.0_rc1-r2.ebuild |
204 |
+++ b/sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild |
205 |
@@ -6,7 +6,7 @@ EAPI=8 |
206 |
MYP="${P//_/}" |
207 |
PYTHON_COMPAT=( python3_{8..9} ) |
208 |
|
209 |
-inherit bash-completion-r1 distutils-r1 linux-info udev |
210 |
+inherit bash-completion-r1 distutils-r1 linux-info systemd tmpfiles udev |
211 |
|
212 |
DESCRIPTION="Cloud computing fabric controller" |
213 |
HOMEPAGE=" |
214 |
@@ -196,13 +196,13 @@ python_compile_all() { |
215 |
python_install_all() { |
216 |
distutils-r1_python_install_all |
217 |
|
218 |
- if use !compute-only; then |
219 |
- for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do |
220 |
- newinitd "${FILESDIR}/nova.initd" "nova-${svc}" |
221 |
- done |
222 |
- fi |
223 |
- use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" |
224 |
- use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" |
225 |
+ for svc in api compute conductor consoleauth network novncproxy scheduler spicehtml5proxy xvpvncproxy; do |
226 |
+ newinitd "${FILESDIR}/nova.initd" "nova-${svc}" |
227 |
+ done |
228 |
+ |
229 |
+ for svc in api compute conductor metadata-api novncproxy os-compute-api scheduler; do |
230 |
+ systemd_dounit "${FILESDIR}/openstack-nova-${svc}.service" |
231 |
+ done |
232 |
|
233 |
diropts -m 0750 -o nova -g qemu |
234 |
dodir /var/log/nova /var/lib/nova/instances |
235 |
@@ -229,6 +229,11 @@ python_install_all() { |
236 |
|
237 |
newbashcomp tools/nova-manage.bash_completion nova-manage |
238 |
|
239 |
+ newtmpfiles "${FILESDIR}/nova.tmpfile" nova.conf |
240 |
+ |
241 |
+ insinto /etc/logrotate.d |
242 |
+ newins "${FILESDIR}/nova.logrotate" nova.conf |
243 |
+ |
244 |
if use iscsi ; then |
245 |
# Install udev rules for handle iscsi disk with right links under /dev |
246 |
udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules |