openstack/charm-glance
Code Issues Proposed changes

Drop v1 suffix from keystone endpoints; this allows v1 and v2 endpoints to

Browse Source 
be used from clients.

Should be backwards compatible with older versions of openstack as well.
This commit is contained in:
James Page
2013-03-28 09:55:42 +00:00
parent 1717bb9579 51c37544ed
commit 79593bbf34
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/glance-relations
View File

@@ -199,7 +199,7 @@ function keystone_joined {
https && scheme="https" || scheme="http"
is_clustered && local host=$(config-get vip) ||
local host=$(unit-get private-address)
url="$scheme://$host:9292/v1"
url="$scheme://$host:9292"
# advertise our API endpoint to keystone
relation-set service="glance" \
@@ -340,7 +340,7 @@ function ha_relation_changed() {
if [ -n "$clustered" ] && is_leader 'res_glance_vip'; then
local port=$((9292 + 10000))
local host=$(config-get vip)
local url="http://$host:$port/v1"
local url="http://$host:$port"
for r_id in `relation-ids identity-service`; do
relation-set -r $r_id service="glance" \
region="$(config-get region)" \
@@ -409,7 +409,7 @@ function ha_relation_changed() {
if [ -n "$clustered" ] && is_leader 'res_glance_vip'; then
local host=$(config-get vip)
https && local scheme="https" || local scheme="http"
local url="$scheme://$host:9292/v1"
local url="$scheme://$host:9292"
for r_id in `relation-ids identity-service`; do
relation-set -r $r_id service="glance" \