Merge lp:~gz/juju-ci-tools/remove_manual_juju_fix_2 into lp:juju-ci-tools

[Martin Packman]

Really fix manual provisioning cleanup script

First shot didn't do the right thing. This one sorts out the env vars, and makes the jujud conditional simpler and removes that as a prerequisite for killing mongod processes.

[Aaron Bentley (abentley)]

This is fine. ps -C will exit with a nonzero status if the argument doesn't match any processes, so you could also do:

"if ps -C jujud; then"

review: Approve

[lp:~gz/juju-ci-tools/remove_manual_juju_fix_2]

1150. By Martin Packman on 2015-11-12

Tweak to ps command suggested by abentley in review

=== modified file 'remove-manual-juju.bash'
--- remove-manual-juju.bash	2015-11-12 15:39:16 +0000
+++ remove-manual-juju.bash	2015-11-12 18:45:35 +0000
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-JUJU_DIR="/var/lib/juju"
-DUMMY_DIR="/var/run/dummy-sink"
 ips="$@"
 for ip in $ips; do
     ssh -i $JUJU_HOME/staging-juju-rsa ubuntu@$ip <<"EOT"
 #!/bin/bash
 set -ux
-if [[ -n "$(ps ax | grep jujud | grep -v grep)" ]]; then
-    sudo touch /var/lib/juju/uninstall-agent
+JUJU_DIR="/var/lib/juju"
+DUMMY_DIR="/var/run/dummy-sink"
+if ps -f -C jujud; then
+    sudo touch $JUJU_DIR/uninstall-agent
     sudo killall -SIGABRT jujud
-    sudo killall -9 mongod
 fi
+sudo killall -9 mongod || true
 if [[ -d $JUJU_DIR ]]; then
     sudo rm -r $JUJU_DIR
 fi