commit 28c397d0796cf24009765422d8ea9dc9cb3a696c
author Andy Bavier <acb@cs.princeton.edu> Mon Sep 28 11:44:36 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Mon Sep 28 11:44:36 2015 -0400
tree 4292ba6d5547552edd642a2a95ec12b2a9f08dc1
parent a4b4e914af6ba6bcb97ef7d5d6537318c62205c1

Tweaks for non-root user

cloudlab-init.sh

diff --git a/cloudlab-init.sh b/cloudlab-init.sh
index bc72b59..f275517 100755
--- a/cloudlab-init.sh
+++ b/cloudlab-init.sh
@@ -48,7 +48,10 @@
 http --auth $AUTH PATCH $XOS/xos/users/1/ public_key="$PUBKEY" enacted=$( date "+%Y-%m-%dT%T")
 
 # Set up controller
-source /root/setup/admin-openrc.sh
+sudo cp /root/setup/admin-openrc.sh /tmp
+sudo chmod a+r /tmp/admin-openrc.sh
+#sudo sed -i 's/:5000/:35357/' /tmp/admin-openrc.sh
+source /tmp/admin-openrc.sh
 http --auth $AUTH POST $XOS/xos/controllers/ name=CloudLab deployment=$XOS/xos/deployments/1/ backend_type=OpenStack version=Juno auth_url=$OS_AUTH_URL admin_user=$OS_USERNAME admin_tenant=$OS_TENANT_NAME admin_password=$OS_PASSWORD domain=Default
 
 # Add controller to site