From c6145ab3080e227171fb91bfa044b10d4d2a54e5 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Wed, 29 May 2013 16:59:17 +0200 Subject: [PATCH] Remove version endpoint in Glance This is wrong, and people keep doing this and bugging the Ceilometer folks about Ceilometer being bugged, whereas it just follows what it is told. Change-Id: I9f5c9d6a48a07b0fe64e9402d06ad4c4aa5bdccb Signed-off-by: Julien Danjou --- .../basic-install/src/basic-install_controller-keystone.xml | 2 +- doc/src/docbkx/openstack-ha/glance-api.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml b/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml index ab0b5bc0d7..db12813822 100644 --- a/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml +++ b/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml @@ -143,7 +143,7 @@ NETWORK_SERVICE=$(keystone service-create --name quantum --type network --descri # Create endpoints keystone endpoint-create --region $KEYSTONE_REGION --service-id $COMPUTE_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':8774/v2/$(tenant_id)s' --adminurl 'http://'"$KEYSTONE_HOST"':8774/v2/$(tenant_id)s' --internalurl 'http://'"$KEYSTONE_HOST"':8774/v2/$(tenant_id)s' keystone endpoint-create --region $KEYSTONE_REGION --service-id $VOLUME_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':8776/v1/$(tenant_id)s' --adminurl 'http://'"$KEYSTONE_HOST"':8776/v1/$(tenant_id)s' --internalurl 'http://'"$KEYSTONE_HOST"':8776/v1/$(tenant_id)s' -keystone endpoint-create --region $KEYSTONE_REGION --service-id $IMAGE_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':9292/v2' --adminurl 'http://'"$KEYSTONE_HOST"':9292/v2' --internalurl 'http://'"$KEYSTONE_HOST"':9292/v2' +keystone endpoint-create --region $KEYSTONE_REGION --service-id $IMAGE_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':9292' --adminurl 'http://'"$KEYSTONE_HOST"':9292' --internalurl 'http://'"$KEYSTONE_HOST"':9292' keystone endpoint-create --region $KEYSTONE_REGION --service-id $IDENTITY_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':5000/v2.0' --adminurl 'http://'"$KEYSTONE_HOST"':35357/v2.0' --internalurl 'http://'"$KEYSTONE_HOST"':5000/v2.0' keystone endpoint-create --region $KEYSTONE_REGION --service-id $EC2_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':8773/services/Cloud' --adminurl 'http://'"$KEYSTONE_HOST"':8773/services/Admin' --internalurl 'http://'"$KEYSTONE_HOST"':8773/services/Cloud' keystone endpoint-create --region $KEYSTONE_REGION --service-id $NETWORK_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':9696/' --adminurl 'http://'"$KEYSTONE_HOST"':9696/' --internalurl 'http://'"$KEYSTONE_HOST"':9696/' diff --git a/doc/src/docbkx/openstack-ha/glance-api.txt b/doc/src/docbkx/openstack-ha/glance-api.txt index dd45bb93a5..ba18bcd85e 100644 --- a/doc/src/docbkx/openstack-ha/glance-api.txt +++ b/doc/src/docbkx/openstack-ha/glance-api.txt @@ -80,5 +80,5 @@ You need also to create the Glance API Endpoint with this IP. NOTE : If you are using both private and public IP, you should create two Virtual IP and define your endpoint like this : ---- -keystone endpoint-create --region $KEYSTONE_REGION --service-id $service-id --publicurl 'http://PUBLIC_VIP:9292/v2' --adminurl 'http://192.168.42.103:9292/v2' --internalurl 'http://192.168.42.103:9292/v2' +keystone endpoint-create --region $KEYSTONE_REGION --service-id $service-id --publicurl 'http://PUBLIC_VIP:9292' --adminurl 'http://192.168.42.103:9292' --internalurl 'http://192.168.42.103:9292' ----