From 82aa41a2bd92d693309a325492df2e4ae3ef88a2 Mon Sep 17 00:00:00 2001 From: termie Date: Mon, 9 Jan 2012 22:15:40 -0800 Subject: [PATCH] oh, comment that out --- files/keystone_data.sh | 54 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/files/keystone_data.sh b/files/keystone_data.sh index 8ec529a5b5..edc8925837 100755 --- a/files/keystone_data.sh +++ b/files/keystone_data.sh @@ -100,33 +100,33 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then fi #endpointTemplates -$BIN_DIR/keystone-manage $* endpointTemplates add \ - RegionOne nova - http://%SERVICE_HOST%:8774/v1.1/%tenant_id% - http://%SERVICE_HOST%:8774/v1.1/%tenant_id% - http://%SERVICE_HOST%:8774/v1.1/%tenant_id% 1 1 -$BIN_DIR/keystone-manage $* endpointTemplates add - RegionOne ec2 - http://%SERVICE_HOST%:8773/services/Cloud - http://%SERVICE_HOST%:8773/services/Admin - http://%SERVICE_HOST%:8773/services/Cloud 1 1 -$BIN_DIR/keystone-manage $* endpointTemplates add - RegionOne glance - http://%SERVICE_HOST%:9292/v1 - http://%SERVICE_HOST%:9292/v1 - http://%SERVICE_HOST%:9292/v1 1 1 -$BIN_DIR/keystone-manage $* endpointTemplates add - RegionOne keystone - http://%SERVICE_HOST%:5000/v2.0 - http://%SERVICE_HOST%:35357/v2.0 - http://%SERVICE_HOST%:5000/v2.0 1 1 -if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then - $BIN_DIR/keystone-manage $* endpointTemplates add - RegionOne swift - http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% - http://%SERVICE_HOST%:8080/ - http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% 1 1 -fi +#$BIN_DIR/keystone-manage $* endpointTemplates add \ +# RegionOne nova +# http://%SERVICE_HOST%:8774/v1.1/%tenant_id% +# http://%SERVICE_HOST%:8774/v1.1/%tenant_id% +# http://%SERVICE_HOST%:8774/v1.1/%tenant_id% 1 1 +#$BIN_DIR/keystone-manage $* endpointTemplates add +# RegionOne ec2 +# http://%SERVICE_HOST%:8773/services/Cloud +# http://%SERVICE_HOST%:8773/services/Admin +# http://%SERVICE_HOST%:8773/services/Cloud 1 1 +#$BIN_DIR/keystone-manage $* endpointTemplates add +# RegionOne glance +# http://%SERVICE_HOST%:9292/v1 +# http://%SERVICE_HOST%:9292/v1 +# http://%SERVICE_HOST%:9292/v1 1 1 +#$BIN_DIR/keystone-manage $* endpointTemplates add +# RegionOne keystone +# http://%SERVICE_HOST%:5000/v2.0 +# http://%SERVICE_HOST%:35357/v2.0 +# http://%SERVICE_HOST%:5000/v2.0 1 1 +#if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then +# $BIN_DIR/keystone-manage $* endpointTemplates add +# RegionOne swift +# http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% +# http://%SERVICE_HOST%:8080/ +# http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% 1 1 +#fi # Tokens #$BIN_DIR/keystone-manage token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00