From 5f5c89ff9a84d28521a2cdee1bd40d85da4ff1e0 Mon Sep 17 00:00:00 2001 From: Luke Browning Date: Mon, 20 Nov 2017 11:41:17 -0600 Subject: [PATCH] Don't refresh trove code in guestagent once installed Presently, the code is reloaded from the controller each time that the guestagent is restarted. The test in the trove-guest.service file is wrong as it is looking for a directory as opposed to a file. This improves the debug ability of the guestagent by allowing LOG.debug statements to be manually inserted in the code. Change-Id: I9703420d5ffd2b4e2d45dcd02435627e731250da --- integration/scripts/files/trove-guest.systemd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/scripts/files/trove-guest.systemd.conf b/integration/scripts/files/trove-guest.systemd.conf index 47bc2cf82d..b9ab6c7925 100644 --- a/integration/scripts/files/trove-guest.systemd.conf +++ b/integration/scripts/files/trove-guest.systemd.conf @@ -12,7 +12,7 @@ ExecStartPre=/bin/bash -c "sudo mkdir -p GUEST_LOGDIR ; sudo chown GUEST_USERNAM # If ~/trove-installed does not exist, copy the trove source from # the user's development environment, then touch the sentinel file -ExecStartPre=/bin/bash -c "test -d /home/GUEST_USERNAME/trove-installed || sudo -u GUEST_USERNAME rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' -avz --exclude='.*' HOST_SCP_USERNAME@CONTROLLER_IP:PATH_TROVE/ /home/GUEST_USERNAME/trove && touch /home/GUEST_USERNAME/trove-installed" +ExecStartPre=/bin/bash -c "test -e /home/GUEST_USERNAME/trove-installed || sudo -u GUEST_USERNAME rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' -avz --exclude='.*' HOST_SCP_USERNAME@CONTROLLER_IP:PATH_TROVE/ /home/GUEST_USERNAME/trove && touch /home/GUEST_USERNAME/trove-installed" # If /etc/trove does not exist, create it and then copy the trove-guestagent.conf # from /etc/trove on the user's development environment,