openstack
/
charm-glance
Code Issues Proposed changes

Ensure all uses of $r_id are localized.

This commit is contained in:
Adam Gandelman 2013-02-18 17:25:27 -08:00
parent 4b3c5892e5
commit 51ed559723
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/glance-common
View File

@ -145,6 +145,7 @@ configure_https() {
set_or_update bind_port "$api_port" "api"
service_ctl all start
local r_id=""
# (re)configure ks endpoint accordingly in ks and nova.
for r_id in "$(relation-ids identity-service)" ; do
keystone_joined "$r_id"

4
hooks/glance-relations
View File

@ -95,7 +95,7 @@ function db_changed {
function image-service_joined {
# Check to see if unit is potential leader
local r_id="$r_id"
local r_id="$1"
[[ -n "$r_id" ]] && r_id="-r $r_id"
eligible_leader 'res_glance_vip' || return 0
https && scheme="https" || scheme="http"
@ -103,7 +103,7 @@ function image-service_joined {
local host=$(unit-get private-address)
url="$scheme://$host:9292"
juju-log "glance: image-service_joined: To peer glance-api-server=$url"
relation-set $r_id glance-api-server="$url"
relation-set $r_id glance-api-server=$url
}
function object-store_joined {

10
hooks/lib/openstack-common
View File

@ -372,6 +372,8 @@ listen $service_name 0.0.0.0:$haproxy_listen_port
option tcplog
server $name $address:$api_listen_port check
EOF
local r_id=""
local unit=""
for r_id in `relation-ids cluster`; do
for unit in `relation-list -r $r_id`; do
local unit_name=${unit////-}
@ -392,6 +394,8 @@ EOF
# Returns: 0 if configured, 1 if not configured
##########################################################################
is_clustered() {
local r_id=""
local unit=""
for r_id in $(relation-ids ha); do
if [ -n "$r_id" ]; then
for unit in $(relation-list -r $r_id); do
@ -412,6 +416,7 @@ is_clustered() {
##########################################################################
peer_units() {
local peers=""
local r_id=""
for r_id in $(relation-ids cluster); do
peers="$peers $(relation-list -r $r_id)"
done
@ -469,7 +474,7 @@ eligible_leader() {
# Returns: 0 if peered, 1 if not peered
##########################################################################
is_peered() {
r_id=$(relation-ids cluster)
local r_id=$(relation-ids cluster)
if [ -n "$r_id" ]; then
if [ -n "$(relation-list -r $r_id)" ]; then
juju-log "Unit peered"
@ -504,6 +509,7 @@ is_leader() {
# Returns: 0 if HTTPS can be configured, 1 if not.
##########################################################################
https() {
local r_id=""
if [[ -n "$(config-get ssl_cert)" ]] &&
[[ -n "$(config-get ssl_key)" ]] ; then
return 0
@ -541,7 +547,7 @@ enable_https() {
key=$(config-get ssl_key)
if [[ -z "$cert" ]] || [[ -z "$key" ]] ; then
juju-log "Inspecting identity-service relations for SSL certificate."
local r_ids=$(relation-ids identity-service)
local r_id=""
for r_id in $(relation-ids identity-service) ; do
for unit in $(relation-list -r $r_id) ; do
cert="$(relation-get -r $r_id ssl_cert $unit)"

2
revision
View File

@ -1 +1 @@
122
124