Fix bare metal collectd agent cleanup

JIRA: VES-1

Change-Id: I20eb6229e47fc00f82f84d444f7f4eecb9cd6734
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

diff --git a/tests/vHello_VES.sh b/tests/vHello_VES.sh
index 00a8361..cc85ebc 100644 (file)
--- a/tests/vHello_VES.sh
+++ b/tests/vHello_VES.sh
@@ -310,7 +310,8 @@ stop() {
       p=":ubuntu"
     fi
     ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $u$p@$ip <<'EOF'
-if [[ $USER == "ubuntu" ]]; then
+dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
+if [ "$dist" == "Ubuntu" ]; then 
   sudo service collectd stop
   sudo apt-get remove -y collectd
   sudo rm /etc/collectd/collectd.conf
@@ -319,8 +320,8 @@ else
   sudo yum remove -y collectd
   sudo rm /etc/collectd.conf
 fi
+rm -rf $HOME/OpenStackBarcelonaDemo
 EOF
-  rm -rf $HOME/OpenStackBarcelonaDemo
   done
 }