[cloudstack] branch 4.13 updated: systemd dependency on db (#3973)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.13 by this push:
     new d93c245  systemd dependency on db (#3973)
d93c245 is described below

commit d93c2459a4afeff631604b8eb2b0c955f90af783
Author: dahn <da...@shapeblue.com>
AuthorDate: Wed Mar 25 19:57:12 2020 +0100

    systemd dependency on db (#3973)
---
 packaging/systemd/cloudstack-agent.service      |  4 ++++
 packaging/systemd/cloudstack-management.service |  8 +++++++-
 packaging/systemd/cloudstack-usage.service      | 11 +++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/packaging/systemd/cloudstack-agent.service b/packaging/systemd/cloudstack-agent.service
index 72e99fe..e04d672 100644
--- a/packaging/systemd/cloudstack-agent.service
+++ b/packaging/systemd/cloudstack-agent.service
@@ -15,6 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Do not modify this file as your changes will be lost in the next CSM update.
+# If you need to add specific dependencies to this service unit do it in the
+# /etc/systemd/system/cloudstack-management.service.d/ directory
+
 [Unit]
 Description=CloudStack Agent
 Documentation=http://www.cloudstack.org/
diff --git a/packaging/systemd/cloudstack-management.service b/packaging/systemd/cloudstack-management.service
index 1f4ded3..b979f7f 100644
--- a/packaging/systemd/cloudstack-management.service
+++ b/packaging/systemd/cloudstack-management.service
@@ -16,10 +16,16 @@
 # under the License.
 
 # Systemd unit file for CloudStack Management server
+# Do not modify this file as your changes will be lost in the next CSM update.
+# If you need to add specific dependencies to this service unit do it in the
+# /etc/systemd/system/cloudstack-management.service.d/ directory
+# If you know that either mysql or mariadb is running on this system is a good idea to
+# add a Requires dependency there. Check systemd documentation for details
 
 [Unit]
 Description=CloudStack Management Server
-After=syslog.target network.target
+After=syslog.target network.target mariadb.service mysqld.service mysql.service
+Wants=mariadb.service mysqld.service mysql.service
 
 [Service]
 UMask=0022
diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service
index 8d9dff2..c23814e 100644
--- a/packaging/systemd/cloudstack-usage.service
+++ b/packaging/systemd/cloudstack-usage.service
@@ -15,11 +15,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Systemd unit file for CloudStack Management server
+# Do not modify this file as your changes will be lost in the next CSM update.
+# If you need to add specific dependencies to this service unit do it in the
+# /etc/systemd/system/cloudstack-management.service.d/ directory
+# If you know that either mysql or mariadb is running on this system is a good idea to
+# add a Requires dependency there. Check systemd documentation for details
+
 [Unit]
 Description=CloudStack Usage Server
 Documentation=http://www.cloudstack.org/
-Wants=network.target network-online.target
-After=network.target network-online.target
+Wants=network.target network-online.target mariadb.service mysqld.service mysql.service
+After=network.target network-online.target mariadb.service mysqld.service mysql.service
 
 [Service]
 Type=simple