/[packages]/cauldron/openqa/current/SOURCES/0001-systemd-start-scheduler-and-webui-and-websockets-aft.patch
ViewVC logotype

Contents of /cauldron/openqa/current/SOURCES/0001-systemd-start-scheduler-and-webui-and-websockets-aft.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1009361 - (show annotations) (download)
Wed May 4 15:47:32 2016 UTC (4 years, 3 months ago) by doktor5000
File size: 2404 byte(s)
- sync with Fedora, backported fixes (thanks to Adam Williamson)
  o backport fix for worker systemd unit with newer systemd
  o backport fix to start services after database services
- use our systemd macros instead of fedora ones
- drop useless %%_systemd_postun_with_restart calls

1 From 9c52ad47e1e55a2f0b809ecc59f2a0081c22eb14 Mon Sep 17 00:00:00 2001
2 From: Adam Williamson <awilliam@redhat.com>
3 Date: Tue, 16 Feb 2016 22:22:56 -0800
4 Subject: [PATCH] systemd: start scheduler (and webui and websockets) after dbs
5
6 If the database is running on the same system, we want to make
7 sure it's up before we try and start the scheduler, webUI and
8 websockets. As we support both postgre and mariadb, list both.
9 gru already has postgresql, but add mariadb for it.
10
11 webui and websockets currently are ordered after scheduler, so
12 we don't really need to do this in all three, but we may as
13 well just in case that changes.
14 ---
15 systemd/openqa-gru.service | 2 +-
16 systemd/openqa-scheduler.service | 1 +
17 systemd/openqa-websockets.service | 2 +-
18 systemd/openqa-webui.service | 1 +
19 4 files changed, 4 insertions(+), 2 deletions(-)
20
21 diff --git a/systemd/openqa-gru.service b/systemd/openqa-gru.service
22 index 7209783..64ef210 100644
23 --- a/systemd/openqa-gru.service
24 +++ b/systemd/openqa-gru.service
25 @@ -1,6 +1,6 @@
26 [Unit]
27 Description=The openQA gru daemon
28 -After=postgresql.service
29 +After=postgresql.service mariadb.service
30
31 [Service]
32 User=geekotest
33 diff --git a/systemd/openqa-scheduler.service b/systemd/openqa-scheduler.service
34 index 42c7ca9..e58ed6d 100644
35 --- a/systemd/openqa-scheduler.service
36 +++ b/systemd/openqa-scheduler.service
37 @@ -1,6 +1,7 @@
38 [Unit]
39 Description=The openQA Scheduler
40 Before=openqa-webui.service openqa-websockets.service
41 +After=postgresql.service mariadb.service
42
43 [Service]
44 User=geekotest
45 diff --git a/systemd/openqa-websockets.service b/systemd/openqa-websockets.service
46 index 86b4b6a..1778c7e 100644
47 --- a/systemd/openqa-websockets.service
48 +++ b/systemd/openqa-websockets.service
49 @@ -2,7 +2,7 @@
50 Description=The openQA WebSockets server
51 Wants=apache2.service
52 Before=apache2.service openqa-webui.service
53 -After=openqa-scheduler.service
54 +After=openqa-scheduler.service postgresql.service mariadb.service
55 Requires=openqa-scheduler.service
56
57 [Service]
58 diff --git a/systemd/openqa-webui.service b/systemd/openqa-webui.service
59 index 6a7c989..7f522f6 100644
60 --- a/systemd/openqa-webui.service
61 +++ b/systemd/openqa-webui.service
62 @@ -2,6 +2,7 @@
63 Description=The openQA web UI
64 Wants=apache2.service
65 Before=apache2.service
66 +After=postgresql.service mariadb.service
67 Requires=openqa-scheduler.service openqa-websockets.service
68
69 [Service]
70 --
71 2.7.1
72

  ViewVC Help
Powered by ViewVC 1.1.28