openstack
/
charm-glance
Code Issues Proposed changes

Update to use keystone service credentials

This commit is contained in:
Adam Gandelman 2012-03-02 12:45:12 -08:00
parent ced2514f62
commit 5c82b5d5b9
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/glance-common
View File

@ -106,8 +106,10 @@ function set_or_update {
*) juju-log "ERROR: set_or_update(): Invalid or no config file specified." \
&& exit 1 ;;
esac
[[ -z $KEY ]] && exit 1
[[ -z $VALUE ]] && exit 1
[[ -z $KEY ]] && juju-log "ERROR: set_or_update(): value $VALUE missing key" \
&& exit 1
[[ -z $VALUE ]] && juju-log "ERROR: set_or_update(): key $KEY missing value" \
&& exit 1
cat $CONF | grep "$KEY = $VALUE" >/dev/null \
&& juju-log "glance: $KEY = $VALUE already set" exit 0
if cat $CONF | grep "$KEY =" >/dev/null ; then

14
hooks/glance-relations
View File

@ -79,7 +79,7 @@ function object-store_changed {
function keystone_joined {
# advertise our API endpoint to keystone
url="http://$(unit-get private-address):9292/v1.1/"
url="http://$(unit-get private-address):9292/v1"
relation-set service="glance" \
region="RegionOne" public_url=$url admin_url=$url internal_url=$url
}
@ -89,8 +89,13 @@ function keystone_changed {
token=$(relation-get admin_token)
service_port=$(relation-get service_port)
auth_port=$(relation-get auth_port)
[[ -z "$token" ]] || [[ -z "$service_port" ]] || [[ -z "$auth_port" ]] &&
juju-log "keystone_changed: Peer not ready" && exit 0
service_username=$(relation-get service_username)
service_password=$(relation-get service_password)
service_tenant=$(relation-get service_tenant)
[[ -z "$token" ]] || [[ -z "$service_port" ]] || [[ -z "$auth_port" ]] ||
[[ -z "$service_username" ]] || [[ -z "$service_password" ]] ||
[[ -z "$service_tenant" ]] && juju-log "keystone_changed: Peer not ready" &&
exit 0
[[ "$token" == "-1" ]] &&
juju-log "keystone_changed: admin token error" && exit 1
juju-log "keystone_changed: Acquired admin. token"
@ -106,6 +111,9 @@ function keystone_changed {
set_or_update "auth_port" "$auth_port" $i
set_or_update "auth_uri" "http://$keystone_host:$service_port/" $i
set_or_update "admin_token" "$token" $i
set_or_update "admin_tenant_name" "$service_tenant" $i
set_or_update "admin_user" "$service_username" $i
set_or_update "admin_password" "$service_password" $i
done
glance_ctl all restart
}

2
revision
View File

@ -1 +1 @@
60
64