commit f0f27ff805b2af06dca1251cec7a553d4fe095e2
author Anthony Young <sleepsonthefloor@gmail.com> Thu Sep 29 16:22:05 2011 -0700
committer Anthony Young <sleepsonthefloor@gmail.com> Thu Sep 29 16:22:05 2011 -0700
tree e77aa3ab0f1876b36c9a8010d1016aef3fed8fd4
parent e0c0a8d9fbac8920a31f031870969fe76c61c6a0

use type='image' for glance

files/keystone_data.sh

diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 23646d2..d1be32d 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -23,14 +23,14 @@
 $BIN_DIR/keystone-manage $* role grant KeystoneServiceAdmin admin
 
 # Services
-$BIN_DIR/keystone-manage $* service add compute compute compute
-$BIN_DIR/keystone-manage $* service add glance glance glance
-$BIN_DIR/keystone-manage $* service add identity identity identity
+$BIN_DIR/keystone-manage $* service add nova compute "Nova Compute Service"
+$BIN_DIR/keystone-manage $* service add glance image "Glance Image Service"
+$BIN_DIR/keystone-manage $* service add keystone identity "Keystone Identity Service"
 
 #endpointTemplates
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne compute http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id%  http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1
+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne nova http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id%  http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1
 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne identity http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:5001/v2.0 http://%HOST_IP%:5000/v2.0 1 1
+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:5001/v2.0 http://%HOST_IP%:5000/v2.0 1 1
 # $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1
 
 # Tokens

stackrc

diff --git a/stackrc b/stackrc
index deb467b..8bc455e 100644
--- a/stackrc
+++ b/stackrc
@@ -16,7 +16,7 @@
 
 # django powered web control panel for openstack
 DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git
-DASH_BRANCH=master
+DASH_BRANCH=glance_type_image
 
 # add nixon, will use this to show munin graphs in dashboard
 NIXON_REPO=https://github.com/cloudbuilders/nixon.git