Browse code

Merge "Handle existing security group rules in volume exercise"

Jenkins authored on 2013/01/12 23:15:16
Showing 1 changed files
... ...
@@ -86,8 +86,12 @@ if ! nova secgroup-list | grep -q $SECGROUP; then
86 86
 fi
87 87
 
88 88
 # Configure Security Group Rules
89
-nova secgroup-add-rule $SECGROUP icmp -1 -1 0.0.0.0/0
90
-nova secgroup-add-rule $SECGROUP tcp 22 22 0.0.0.0/0
89
+if ! nova secgroup-list-rules $SECGROUP | grep -q icmp; then
90
+    nova secgroup-add-rule $SECGROUP icmp -1 -1 0.0.0.0/0
91
+fi
92
+if ! nova secgroup-list-rules $SECGROUP | grep -q " tcp .* 22 "; then
93
+    nova secgroup-add-rule $SECGROUP tcp 22 22 0.0.0.0/0
94
+fi
91 95
 
92 96
 # determinine instance type
93 97
 # -------------------------