openstack/devstack
Code Issues Proposed changes

more tweaks to get dash working

Browse Source
This commit is contained in:
Anthony Young 2011-09-23 07:34:38 +00:00
parent 853092855b
commit 36d2527790
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/dash_settings.py
View File

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

2
stack.sh
View File

@ -157,7 +157,7 @@ git_clone https://github.com/cloudbuilders/noVNC.git $NOVNC_DIR
# django powered web control panel for openstack # django powered web control panel for openstack
git_clone https://github.com/cloudbuilders/openstack-dashboard.git $DASH_DIR git_clone https://github.com/cloudbuilders/openstack-dashboard.git $DASH_DIR
# FIXME - need to factor out logic like this # 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 # add nixon, will use this to show munin graphs in dashboard
git_clone https://github.com/cloudbuilders/nixon.git $NIXON_DIR git_clone https://github.com/cloudbuilders/nixon.git $NIXON_DIR
# python client library to nova that dashboard (and others) use # python client library to nova that dashboard (and others) use