Merge remote-tracking branch 'origin/master' into pause
diff --git a/exercise.sh b/exercise.sh
index f512691..f7dd175 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -127,6 +127,23 @@
exit 1
fi
+# pause the VM and verify we can't ping it anymore
+nova pause $NAME
+
+sleep 2
+
+if ( ping -c1 -w1 $IP); then
+ echo "Pause failure - ping shouldn't work"
+ exit 1
+fi
+
+# unpause the VM and verify we can ping it again
+nova unpause $NAME
+
+sleep 2
+
+ping -c1 -w1 $IP
+
# dis-allow icmp traffic (ping)
nova secgroup-delete-rule $SECGROUP icmp -1 -1 0.0.0.0/0
diff --git a/stack.sh b/stack.sh
index 0750d26..3f93ca8 100755
--- a/stack.sh
+++ b/stack.sh
@@ -120,7 +120,7 @@
fi
exit 1
else
- # Our user needs passwordless priviledges for certain commands which nova
+ # Our user needs passwordless priviledges for certain commands which nova
# uses internally.
# Natty uec images sudoers does not have a '#includedir'. add one.
sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
@@ -607,6 +607,7 @@
rm -f $NOVA_DIR/bin/nova.conf
add_nova_flag "--verbose"
add_nova_flag "--nodaemon"
+add_nova_flag "--allow_admin_api"
add_nova_flag "--scheduler_driver=$SCHEDULER"
add_nova_flag "--dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf"
add_nova_flag "--network_manager=nova.network.manager.$NET_MAN"