From 01ee317c81295d371bfa5f7d7a25732e79765690 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 16 Mar 2020 16:42:28 +0100 Subject: [PATCH 1/7] systemd dependency on db --- packaging/systemd/cloudstack-management.service | 3 ++- packaging/systemd/cloudstack-usage.service | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packaging/systemd/cloudstack-management.service b/packaging/systemd/cloudstack-management.service index 1f4ded3d6138..ecc3a277b06f 100644 --- a/packaging/systemd/cloudstack-management.service +++ b/packaging/systemd/cloudstack-management.service @@ -19,7 +19,8 @@ [Unit] Description=CloudStack Management Server -After=syslog.target network.target +After=syslog.target network.target mariadb.target +Wants=mariadb.target [Service] UMask=0022 diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service index 8d9dff27cdec..35d60b2b7f40 100644 --- a/packaging/systemd/cloudstack-usage.service +++ b/packaging/systemd/cloudstack-usage.service @@ -18,8 +18,8 @@ [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.target +After=network.target network-online.target mariadb.target [Service] Type=simple From 38c3efc8d20bfbd8b9dd37fac50ba542e4486ad8 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 17 Mar 2020 09:54:58 +0100 Subject: [PATCH 2/7] mysql as well as mariadb --- packaging/systemd/cloudstack-management.service | 4 ++-- packaging/systemd/cloudstack-usage.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/systemd/cloudstack-management.service b/packaging/systemd/cloudstack-management.service index ecc3a277b06f..e2691b55a72e 100644 --- a/packaging/systemd/cloudstack-management.service +++ b/packaging/systemd/cloudstack-management.service @@ -19,8 +19,8 @@ [Unit] Description=CloudStack Management Server -After=syslog.target network.target mariadb.target -Wants=mariadb.target +After=syslog.target network.target mariadb.target mysql.target +Wants=mariadb.target mysql.target [Service] UMask=0022 diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service index 35d60b2b7f40..83bb426b1cea 100644 --- a/packaging/systemd/cloudstack-usage.service +++ b/packaging/systemd/cloudstack-usage.service @@ -18,8 +18,8 @@ [Unit] Description=CloudStack Usage Server Documentation=http://www.cloudstack.org/ -Wants=network.target network-online.target mariadb.target -After=network.target network-online.target mariadb.target +Wants=network.target network-online.target mariadb.target mysql.target +After=network.target network-online.target mariadb.target mysql.target [Service] Type=simple From bb32fbb3dbaf522a6a768803fa674de0ce01eb9e Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 17 Mar 2020 10:49:04 +0100 Subject: [PATCH 3/7] depend on service not target (for now) --- packaging/systemd/cloudstack-management.service | 4 ++-- packaging/systemd/cloudstack-usage.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/systemd/cloudstack-management.service b/packaging/systemd/cloudstack-management.service index e2691b55a72e..1bb8822634da 100644 --- a/packaging/systemd/cloudstack-management.service +++ b/packaging/systemd/cloudstack-management.service @@ -19,8 +19,8 @@ [Unit] Description=CloudStack Management Server -After=syslog.target network.target mariadb.target mysql.target -Wants=mariadb.target mysql.target +After=syslog.target network.target mariadb.service mysql.service +Wants=mariadb.service mysql.service [Service] UMask=0022 diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service index 83bb426b1cea..3c1495db1373 100644 --- a/packaging/systemd/cloudstack-usage.service +++ b/packaging/systemd/cloudstack-usage.service @@ -18,8 +18,8 @@ [Unit] Description=CloudStack Usage Server Documentation=http://www.cloudstack.org/ -Wants=network.target network-online.target mariadb.target mysql.target -After=network.target network-online.target mariadb.target mysql.target +Wants=network.target network-online.target mariadb.service mysql.service +After=network.target network-online.target mariadb.service mysql.service [Service] Type=simple From a9a757fb17287ee7c94b4f6edba244142b2116b5 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 23 Mar 2020 08:59:23 +0100 Subject: [PATCH 4/7] sugested comment by @rvalle --- packaging/systemd/cloudstack-agent.service | 6 ++++++ packaging/systemd/cloudstack-management.service | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/packaging/systemd/cloudstack-agent.service b/packaging/systemd/cloudstack-agent.service index 72e99fe53844..89f2d0dbb879 100644 --- a/packaging/systemd/cloudstack-agent.service +++ b/packaging/systemd/cloudstack-agent.service @@ -15,6 +15,12 @@ # 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 +# 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 Agent Documentation=http://www.cloudstack.org/ diff --git a/packaging/systemd/cloudstack-management.service b/packaging/systemd/cloudstack-management.service index 1bb8822634da..59290613f250 100644 --- a/packaging/systemd/cloudstack-management.service +++ b/packaging/systemd/cloudstack-management.service @@ -16,6 +16,11 @@ # 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 From 93e4e3af3c31689d961fce369d567c9a302b0ca6 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 23 Mar 2020 09:36:14 +0100 Subject: [PATCH 5/7] should have gone in usage, not agent --- packaging/systemd/cloudstack-agent.service | 2 -- packaging/systemd/cloudstack-usage.service | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packaging/systemd/cloudstack-agent.service b/packaging/systemd/cloudstack-agent.service index 89f2d0dbb879..e04d672beaaa 100644 --- a/packaging/systemd/cloudstack-agent.service +++ b/packaging/systemd/cloudstack-agent.service @@ -18,8 +18,6 @@ # 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 Agent diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service index 3c1495db1373..8188bfe381e4 100644 --- a/packaging/systemd/cloudstack-usage.service +++ b/packaging/systemd/cloudstack-usage.service @@ -15,6 +15,13 @@ # 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/ From 4ac430d56c004e2a5b08fec0d79a824e497e6866 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 24 Mar 2020 19:53:10 +0100 Subject: [PATCH 6/7] mysql replaced with mysqld --- packaging/systemd/cloudstack-management.service | 4 ++-- packaging/systemd/cloudstack-usage.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/systemd/cloudstack-management.service b/packaging/systemd/cloudstack-management.service index 59290613f250..bfd87245b96c 100644 --- a/packaging/systemd/cloudstack-management.service +++ b/packaging/systemd/cloudstack-management.service @@ -24,8 +24,8 @@ [Unit] Description=CloudStack Management Server -After=syslog.target network.target mariadb.service mysql.service -Wants=mariadb.service mysql.service +After=syslog.target network.target mariadb.service mysqld.service +Wants=mariadb.service mysqld.service [Service] UMask=0022 diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service index 8188bfe381e4..3988c3ff1dd0 100644 --- a/packaging/systemd/cloudstack-usage.service +++ b/packaging/systemd/cloudstack-usage.service @@ -25,8 +25,8 @@ [Unit] Description=CloudStack Usage Server Documentation=http://www.cloudstack.org/ -Wants=network.target network-online.target mariadb.service mysql.service -After=network.target network-online.target mariadb.service mysql.service +Wants=network.target network-online.target mariadb.service mysqld.service +After=network.target network-online.target mariadb.service mysqld.service [Service] Type=simple From c66b94d58d6a078110bdd4280986693b62a615bf Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 24 Mar 2020 19:57:06 +0100 Subject: [PATCH 7/7] mysql added back --- packaging/systemd/cloudstack-management.service | 4 ++-- packaging/systemd/cloudstack-usage.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/systemd/cloudstack-management.service b/packaging/systemd/cloudstack-management.service index bfd87245b96c..b979f7f375a7 100644 --- a/packaging/systemd/cloudstack-management.service +++ b/packaging/systemd/cloudstack-management.service @@ -24,8 +24,8 @@ [Unit] Description=CloudStack Management Server -After=syslog.target network.target mariadb.service mysqld.service -Wants=mariadb.service mysqld.service +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 3988c3ff1dd0..c23814eaac66 100644 --- a/packaging/systemd/cloudstack-usage.service +++ b/packaging/systemd/cloudstack-usage.service @@ -25,8 +25,8 @@ [Unit] Description=CloudStack Usage Server Documentation=http://www.cloudstack.org/ -Wants=network.target network-online.target mariadb.service mysqld.service -After=network.target network-online.target mariadb.service mysqld.service +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