This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 53ec27c scripts: don't restart systemvm cloud.service post cert
import (#3134)
new 3aaf281 Merge remote-tracking branch 'origin/4.11'
53ec27c is described below
commit 53ec27cd7a6e68124249a7f8c3c432d744ca9218
Author: Rohit Yadav <ro...@apache.org>
AuthorDate: Wed Jan 16 21:48:57 2019 +0530
scripts: don't restart systemvm cloud.service post cert import (#3134)
This ensures that the systemvm agent (cloud.service) is not restarted
on certificate import. The agent has an inbuilt logic to attempt
reconnection.
If the old certificates/keystore is invalid agent will attempt reconnection.
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
scripts/util/keystore-cert-import | 5 -----
1 file changed, 5 deletions(-)
diff --git a/scripts/util/keystore-cert-import
b/scripts/util/keystore-cert-import
index 96196d9..424ab4a 100755
--- a/scripts/util/keystore-cert-import
+++ b/scripts/util/keystore-cert-import
@@ -100,11 +100,6 @@ if [ -f "$SYSTEM_FILE" ]; then
update-ca-certificates > /dev/null 2>&1 || true
fi
-# Restart cloud service if we're in systemvm
-if [ "$MODE" == "ssh" ] && [ -f $SYSTEM_FILE ]; then
- systemctl restart cloud > /dev/null 2>&1
-fi
-
# Fix file permission
chmod 600 $CACERT_FILE
chmod 600 $CERT_FILE
