commit f06833c9b9d19e408594a8b60b9b6575962ecaa4
author Zack Williams <zdw@artisancomputer.com> Thu Jun 02 07:38:07 2016 -0700
committer Zack Williams <zdw@artisancomputer.com> Thu Jun 02 07:38:07 2016 -0700
tree 5fee4dc39edfc716757b383c275c8731fc5533d6
parent 80d4f222ba2fe36ab8bee53e50895103cf6d93a3
parent de3f46738fa5d3cdf659800cef4041a94829abf0

prepped for merge

scripts/single-node-pod.sh

diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index f1d368e..72050d9 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
 
 function cleanup_from_previous_test() {
-
     echo "## Cleanup ##"
 
     echo "Destroying juju environment"
     juju destroy-environment --force -y manual
 
-    VMS=$( sudo virsh list|grep running|awk '{print $2}' )
+    VMS=$( sudo uvt-kvm list )
     for VM in $VMS
     do
       echo "Destroying $VM"
@@ -38,7 +37,6 @@
 
     git clone https://github.com/open-cloud/openstack-cluster-setup.git
     cd ~/openstack-cluster-setup
-    git checkout roles
 
     sed -i "s/ubuntu/`whoami`/" $INVENTORY
     cp vars/example_keystone.yml vars/cord_keystone.yml