more tweaks to get dash working

files/dash_settings.py

@@ -47,7 +47,7 @@ MAILER_EMAIL_BACKEND = EMAIL_BACKEND
 
 # FIXME: This needs to be changed to allow for multi-node setup.
 OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0/"
-OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:5001/v2.0/"
+OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:5001/v2.0"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
 
 # NOTE(tres): Available services should come from the service

stack.sh

@@ -157,7 +157,7 @@ git_clone https://github.com/cloudbuilders/noVNC.git $NOVNC_DIR
 # django powered web control panel for openstack
 git_clone https://github.com/cloudbuilders/openstack-dashboard.git $DASH_DIR
 # FIXME - need to factor out logic like this
-cd $DASH_DIR && sudo git pull && sudo git checkout keystone_diablo
+cd $DASH_DIR && sudo git fetch && sudo git checkout origin/keystone_diablo
 # add nixon, will use this to show munin graphs in dashboard
 git_clone https://github.com/cloudbuilders/nixon.git $NIXON_DIR
 # python client library to nova that dashboard (and others) use