diff --git a/puppet/modules/devstack/files/local.sh b/puppet/modules/devstack/files/local.sh
index 456cf1b..a44cf9f 100644
--- a/puppet/modules/devstack/files/local.sh
+++ b/puppet/modules/devstack/files/local.sh
@@ -2,17 +2,15 @@
 
 set -o xtrace
 
+echo "Running local.sh"
+
 openrc=/home/stack/devstack/openrc
-source $openrc admin
 
 if is_service_enabled n-api; then
     for user in admin demo; do
         source $openrc $user
         nova keypair-add --pub-key /home/stack/.ssh/authorized_keys default
+        nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0
+        nova secgroup-add-rule default tcp 22 22 0.0.0.0/0
     done
-
-    source $openrc admin
-
-    nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0
-    nova secgroup-add-rule default tcp 22 22 0.0.0.0/0
 fi