service changes to ensure service restarts on every exit code and as well restarts dependant services

10 files changed, 35 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae6f0d992525..28cd817a304f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
 	pkgver = 5.4.0
-	pkgrel = 4
+	pkgrel = 5
 	url = http://docs.opennebula.org/stable
 	install = opennebula.install
 	changelog = ChangeLog
@@ -96,13 +96,13 @@ pkgbase = opennebula
 	source = vip.sh.patch
 	source = opennebula.install
 	sha512sums = 4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626
-	sha512sums = c669df1cacf74124b04913f38d6468d78a8ac86e059676611c993ed5528fd7d17bbb92c87562836c8fe22ea80d848fa9d9f46c30664a05d10cf91d1363f3087f
-	sha512sums = b1a361cabc5b49ec8cbe497d8a6f205ed222dadda70ec33f922050b8bdf86b1e52c7098d732b752493ce3626c043f6b482f33dd380f0ebaaf2f53415f58cb75d
-	sha512sums = 9e6c1017a58e5d53529342c55b241c4d2dac1470fc163e4e8c4e69fe42da4d2d8a58dafdf5ab2adb30ac1d8cdc79d73f7b66392855a8f4ce1fa7e7da65554ac7
-	sha512sums = 62e8a3640df5e4a9619cbd24dddaa273103fe0b4af5edd6947442c213dbff34993868f091662ce42c0c7b1398a3407bf62c0a57b5cf8f88f0d50f0270040c0e3
-	sha512sums = 3be1b0ea68e72ddd0756128d65bb4037cf6a868a007e1a0c57fe52c5f5e10ebf60262bb35709d1d8f0666864f2c82c6b203e3e09a28f6931f33496452e1599c0
-	sha512sums = 5ab22f35adfd48444accef6ffa2483665bd178dbad2320929b7be7e4bdc8a2782087f36c8b518537765bcf12dfdb3f5fcc19b8b34f41f2e1f85fb81071728e55
-	sha512sums = d856c5469703168e8cd3b53b68cca7555885c7c01ee7bad69dfc070448247c2da8434c1a49455edab6b6a0cf6ed127a1729758137b3535dd881c374de7e17c1c
+	sha512sums = 3d63703f869313ddccc8595ceaca2c65bcfab5ea771df3471909b8421587c1c596227094dbc99fe91181cc0dacf2fdc1a772f88124ee5eb6fa141123998c21ea
+	sha512sums = a563f1c6458d16c6b13f92aaf0b515127a2c30f25cd398eba0571d511fd38dfcfc0a3374d2df242dbd1963f6a0fd85fa95ee8ac1766f8d39717d7998479d9db9
+	sha512sums = e5129f9464edc3719d035b81429d1f12af6519b33be7842aa07583f26ac26dcf02545128d68a077c673c7e37debddf5e28edc1cb8d80f9a8a3e9c85f39c80710
+	sha512sums = a78cefc6a28674c8c65d22d8de242130ae46c1aafc82292fe470cd4890dbb5f08b4d74dc72c1961782e96bc415f5d439db2d05d272b43ee84ebdb75cd7026f7b
+	sha512sums = 44b1697d73e6b67cbad5c581f19fa57d730aedd87c4513080628845296d21454f208c746205bef35564dbbb8ca52935441d01bed790d4f3a63ae474e0b9f253d
+	sha512sums = 17ce8a26f187af95420b28fa3fd2db173fd98997080b3de99dc6d077e03054b9d98eff670728dcad34f54b9d27abe69ac4c7cdab2ebab02e9da159921bb1d2b8
+	sha512sums = 645765b6752d5a021412e633b950959201d0be92e4845894dba2a3137e1dae57d62f41b55ebbd098a065528ba836b07c3ebf1a7a6f7cbfa49b2a3da12ead6012
 	sha512sums = 620581599f1b0c4c6d4fdb87a6b41c937b8ef79401a6a047f8556517c726a5c61f9fc241a3d82a836b5728de3aa36a11d45cbfb1beb111e35c75485cb7b97228
 	sha512sums = 59ccef79f578997b5a1ef5bf53bc36beb233f935b13da466b887254272036b876946e1b74ed3692f4dc8bc2cc3855a61f06d047e179d8aefe73afbfeb886b655
 	sha512sums = 01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2
diff --git a/ChangeLog b/ChangeLog
index f94fe235b961..411cf2e23401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-07 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
+
+  * 5.4.0-5:
+  Ensure service uptime by restarting it on every exit code
+  Make sure dependant services get restarted when opennebula restarts
+
 2017-08-24 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
 
   * 5.4.0-4:
diff --git a/PKGBUILD b/PKGBUILD
index 6331266eeb7b..2a9c24a3c289 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=opennebula
 _unstable_pkg=opennebula-unstable
 pkgver=5.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)"
 arch=('i686' 'x86_64')
 url='http://docs.opennebula.org/stable'
@@ -103,13 +103,13 @@ source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname
         'vip.sh.patch'
         'opennebula.install')
 sha512sums=('4d7d4f6c20a6185539a88006e4d15681d90cee45506d36017a538415a3b3cce809f02ff248013f9e2daa5f1d20afd308a0a014853b8462723ad6ba5acaa84626' #package
-            'c669df1cacf74124b04913f38d6468d78a8ac86e059676611c993ed5528fd7d17bbb92c87562836c8fe22ea80d848fa9d9f46c30664a05d10cf91d1363f3087f' #opennebula.service
-            'b1a361cabc5b49ec8cbe497d8a6f205ed222dadda70ec33f922050b8bdf86b1e52c7098d732b752493ce3626c043f6b482f33dd380f0ebaaf2f53415f58cb75d' #opennebula-scheduler.service
-            '9e6c1017a58e5d53529342c55b241c4d2dac1470fc163e4e8c4e69fe42da4d2d8a58dafdf5ab2adb30ac1d8cdc79d73f7b66392855a8f4ce1fa7e7da65554ac7' #opennebula-sunstone.service
-            '62e8a3640df5e4a9619cbd24dddaa273103fe0b4af5edd6947442c213dbff34993868f091662ce42c0c7b1398a3407bf62c0a57b5cf8f88f0d50f0270040c0e3' #opennebula-econe.service
-            '6e520889ac98e5ea17d7310c6bcb6fa14d68b8003dc6f57cf290545240224a428747bd157df4e2d1955c77ce7ebffad0b3eaa54ffc53db592696899533cc294e' #opennebula-oneflow.service
-            '5ab22f35adfd48444accef6ffa2483665bd178dbad2320929b7be7e4bdc8a2782087f36c8b518537765bcf12dfdb3f5fcc19b8b34f41f2e1f85fb81071728e55' #opennebula-onegate.service
-            'd856c5469703168e8cd3b53b68cca7555885c7c01ee7bad69dfc070448247c2da8434c1a49455edab6b6a0cf6ed127a1729758137b3535dd881c374de7e17c1c' #opennebula-novnc.service
+            '3d63703f869313ddccc8595ceaca2c65bcfab5ea771df3471909b8421587c1c596227094dbc99fe91181cc0dacf2fdc1a772f88124ee5eb6fa141123998c21ea' #opennebula.service
+            'a563f1c6458d16c6b13f92aaf0b515127a2c30f25cd398eba0571d511fd38dfcfc0a3374d2df242dbd1963f6a0fd85fa95ee8ac1766f8d39717d7998479d9db9' #opennebula-scheduler.service
+            'e5129f9464edc3719d035b81429d1f12af6519b33be7842aa07583f26ac26dcf02545128d68a077c673c7e37debddf5e28edc1cb8d80f9a8a3e9c85f39c80710' #opennebula-sunstone.service
+            'a78cefc6a28674c8c65d22d8de242130ae46c1aafc82292fe470cd4890dbb5f08b4d74dc72c1961782e96bc415f5d439db2d05d272b43ee84ebdb75cd7026f7b' #opennebula-econe.service
+            '44b1697d73e6b67cbad5c581f19fa57d730aedd87c4513080628845296d21454f208c746205bef35564dbbb8ca52935441d01bed790d4f3a63ae474e0b9f253d' #opennebula-oneflow.service
+            '17ce8a26f187af95420b28fa3fd2db173fd98997080b3de99dc6d077e03054b9d98eff670728dcad34f54b9d27abe69ac4c7cdab2ebab02e9da159921bb1d2b8' #opennebula-onegate.service
+            '645765b6752d5a021412e633b950959201d0be92e4845894dba2a3137e1dae57d62f41b55ebbd098a065528ba836b07c3ebf1a7a6f7cbfa49b2a3da12ead6012' #opennebula-novnc.service
             '620581599f1b0c4c6d4fdb87a6b41c937b8ef79401a6a047f8556517c726a5c61f9fc241a3d82a836b5728de3aa36a11d45cbfb1beb111e35c75485cb7b97228' #opennebula.conf
             '59ccef79f578997b5a1ef5bf53bc36beb233f935b13da466b887254272036b876946e1b74ed3692f4dc8bc2cc3855a61f06d047e179d8aefe73afbfeb886b655' #opennebula.logrotate
             '01aaf2d6019003ab69cd2e9886618d59bed27062f68fe72f29662f70af9206ce3921053c4cab30c370da958be243a6b19e85094af40ff93b6e370505ddd8bbe2' #chown_fix.patch
diff --git a/opennebula-econe.service b/opennebula-econe.service
index 294a50b21957..d58f2ff72253 100644
--- a/opennebula-econe.service
+++ b/opennebula-econe.service
@@ -11,7 +11,7 @@ Type=simple
 ExecStart=/usr/bin/ruby /usr/lib/one/ruby/cloud/econe/econe-server.rb
 ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/econe-server.pid
-Restart=on-abnormal
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-novnc.service b/opennebula-novnc.service
index 306a4dc48060..d00360760cd6 100644
--- a/opennebula-novnc.service
+++ b/opennebula-novnc.service
@@ -10,6 +10,7 @@ Type=forking
 
 ExecStart=/usr/bin/novnc-server start
 PIDFile=/var/lock/one/.novnc.lock
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-oneflow.service b/opennebula-oneflow.service
index 1aa91aa6c48d..fa1e01f6d0df 100644
--- a/opennebula-oneflow.service
+++ b/opennebula-oneflow.service
@@ -8,10 +8,11 @@ User=oneadmin
 Group=cloud
 Type=simple
 
+
 ExecStart=/usr/bin/ruby /usr/lib/one/oneflow/oneflow-server.rb
 ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/oneflow.pid
-Restart=on-abnormal
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-onegate.service b/opennebula-onegate.service
index faec24cdc58d..63db31ca74e3 100644
--- a/opennebula-onegate.service
+++ b/opennebula-onegate.service
@@ -11,7 +11,7 @@ Type=simple
 ExecStart=/usr/bin/ruby /usr/lib/one/onegate/onegate-server.rb
 ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/onegate.pid
-Restart=on-abnormal
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-scheduler.service b/opennebula-scheduler.service
index de911cbb8dd2..8d3bb2150fa3 100644
--- a/opennebula-scheduler.service
+++ b/opennebula-scheduler.service
@@ -11,7 +11,7 @@ Type=simple
 ExecStart=/usr/bin/mm_sched
 ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/sched.pid
-Restart=on-abnormal
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula-sunstone.service b/opennebula-sunstone.service
index ca5ad85e34a2..cf1a45cbbd26 100644
--- a/opennebula-sunstone.service
+++ b/opennebula-sunstone.service
@@ -2,6 +2,7 @@
 Description=OpenNebula Web Interface
 After=syslog.target network.target remote-fs.target opennebula.service opennebula-novnc.service
 BindsTo=opennebula.service
+Wants=opennebula-novnc.service
 
 [Service]
 User=oneadmin
@@ -10,9 +11,9 @@ Type=simple
 PermissionsStartOnly=true
 
 ExecStart=/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb
-ExecStartPre=/usr/bin/logrotate -s /tmp/logrotate.state -f /etc/logrotate.d/opennebula
+ExecStop=/bin/kill -TERM $MAINPID
 PIDFile=/var/run/one/sunstone.pid
-Restart=on-abnormal
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/opennebula.service b/opennebula.service
index 443641a88250..89d2e683a563 100644
--- a/opennebula.service
+++ b/opennebula.service
@@ -1,8 +1,10 @@
 [Unit]
 Description=OpenNebula management
-After=syslog.target network.target local-fs.target remote-fs.target mysqld.service
+After=syslog.target network.target local-fs.target remote-fs.target
+Requires=mysqld.service
 Before=opennebula-scheduler.service
 BindTo=opennebula-scheduler.service
+Wants=opennebula-sunstone.service opennebula-econe.service opennebula-onegate.service opennebula-oneflow.service opennebula-scheduler.service
 
 [Service]
 User=oneadmin
@@ -20,7 +22,7 @@ ExecStartPre=/usr/bin/logrotate -s /tmp/logrotate.state -f /etc/logrotate.d/open
 ExecStop=/bin/kill -TERM $MAINPID
 ExecStopPost=/usr/bin/rm /var/lock/one/one
 PIDFile=/var/run/one/oned.pid
-Restart=on-abnormal
+Restart=always
 
 [Install]
 WantedBy=multi-user.target