commit 4500a5f69e3bb6a66a18b78f4523f49f36dabd2e
author koder aka kdanilov <kdanilov@mirantis.com> Fri Apr 17 16:55:17 2015 +0300
committer koder aka kdanilov <kdanilov@mirantis.com> Fri Apr 17 16:55:24 2015 +0300
tree 969029f77eeea424e594a9ffdf95031d777e7040
parent 69339acf1f162d6df50366d3aa60da52182667c8

fixing bugs

scripts/config.sh

diff --git a/scripts/config.sh b/scripts/config.sh
index 2283eee..2937edc 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -1,4 +1,4 @@
-FLAVOR_NAME="disk_io_perf.256"
+FLAVOR_NAME="disk_io_perf.1024"
 SERV_GROUP="disk_io_perf.aa"
 KEYPAIR_NAME="disk_io_perf"
 IMAGE_NAME="disk_io_perf"
@@ -10,3 +10,4 @@
 VM_COUNT="x1"
 TESTER_TYPE="iozone"
 RUNNER="ssh"
+SECGROUP='disk_io_perf'

scripts/prepare.sh

diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index 7151b2f..587f577 100644
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -5,8 +5,8 @@
 source "$my_dir/config.sh"
 
 # settings
-FL_RAM=256
-FL_HDD=20
+FL_RAM=1024
+FL_HDD=50
 FL_CPU=1
 
 
@@ -45,6 +45,14 @@
         echo " Not Found"
     fi
 
+    echo -n "Looking for security group $SECGROUP ... "
+    export secgroup_id=$(nova secgroup-list | grep " $SECGROUP " | awk '{print $2}' )
+    if [ ! -z "$secgroup_id" ] ; then
+        echo " Found"
+    else
+        echo " Not Found"
+    fi
+
     set -e
 }
 
@@ -75,6 +83,10 @@
         echo "deleting keypair file $KEY_FILE_NAME"
         rm -f "$KEY_FILE_NAME"
     fi
+
+    if [ ! -z "$secgroup_id" ] ; then
+        nova secgroup-delete $SECGROUP >/dev/null
+    fi
 }
 
 function prepare() {
@@ -103,11 +115,12 @@
         chmod og= "$KEY_FILE_NAME"
     fi
 
-    echo "Adding rules for ping and ssh"
-    set +e
-    nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 >/dev/null
-    nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 >/dev/null
-    set -e
+    if [ -z "$secgroup_id" ] ; then
+        echo "Adding rules for ping and ssh"
+        nova secgroup-create $SECGROUP $SECGROUP >/dev/null
+        nova secgroup-add-rule $SECGROUP icmp -1 -1 0.0.0.0/0 >/dev/null
+        nova secgroup-add-rule $SECGROUP tcp 22 22 0.0.0.0/0 >/dev/null
+    fi
 }
 
 if [ "$1" = "--clear" ] ; then