0001-fix-services-files.patch

The attached patch fixes all known issues with te services files - Robert Schweikert, 05/15/2012 08:37 PM

Download (4.01 KB)

View differences:

share/etc/systemd/openSUSE/one.service
2 2
Description=OpenNebula Cloud Controller Daemon
3 3
After=syslog.target
4 4
After=network.target
5
After=remote_fs.target
5
After=remote-fs.target
6 6
Before=one_scheduler.service
7 7
# Do not start if the scheduler does not exist
8 8
ConditionFileIsExecutable=/usr/bin/mm_sched
9
!ConditionFileExists=/var/run/one/oned.pid
9
# Directory lock and run directories must exist
10
ConditionPathIsDirectory=/var/lock/one
11
ConditionPathIsDirectory=/var/run/one
12
# The PID file for the process should not exist, we either have a
13
# running process or the previous run did not exit cleanly
14
!ConditionPathExists=/var/run/one/oned.pid
10 15

  
11 16
[Service]
12
ExecStart=/usr/bin/oned
17
# Start daemon in forground mode, when starting as forking process the
18
# daemon shuts down without obvious reason.
19
ExecStart=/usr/bin/oned -f
13 20
# Log file location must exist
14 21
ExecStartPre=/bin/mkdir -p /var/log/one
15 22
ExecStartPre=/bin/chown oneadmin:cloud /var/log/one
16 23
ExecStop=/bin/kill -TERM $MAINPID
17 24
PIDFile=/var/run/one/oned.pid
18
Type=forking
19

  
20
[Exec]
25
Type=simple
21 26
Group=cloud
22 27
User=oneadmin
23 28

  
share/etc/systemd/openSUSE/one_scheduler.service
2 2
Description=OpenNebula Cloud Scheduler Daemon
3 3
After=syslog.target
4 4
After=network.target
5
After=remote_fs.target
5
After=remote-fs.target
6 6
After=one.service
7 7
BindTo=one.service
8 8
!ConditionFileExists=/var/run/one/sched.pid
......
13 13
ExecStop=/bin/kill -TERM $MAINPID
14 14
PIDFile=/var/run/one/sched.pid
15 15
Type=simple
16

  
17
[Exec]
18 16
Group=cloud
19 17
User=oneadmin
20 18

  
share/etc/systemd/openSUSE/ozones.service
13 13
ExecStop=/bin/kill -INT $MAINPID
14 14
PIDFile=/var/run/one/ozones.pid
15 15
Type=simple
16

  
17
[Exec]
18 16
Group=cloud
19 17
User=oneadmin
20 18

  
share/etc/systemd/openSUSE/sunstone.service
8 8
!ConditionFileExists=/var/lock/one/.sunstone.lock
9 9

  
10 10
[Service]
11
ExecStart=/bin/bash -c "/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb > /var/log/one/sunstone.log 2>&1"
11
ExecStart=/bin/bash -c "/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb > /var/log/one/sunstone.log 2>/var/log/one/sunstone.error"
12 12
ExecStop=/bin/kill -INT $MAINPID
13 13
PIDFile=/var/run/one/sunstone.pid
14 14
Type=simple
15

  
16
[Exec]
17 15
Group=cloud
18 16
User=oneadmin
19 17

  
20
-