openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Revert use of 'relation-get private-address'

This commit is contained in:
Adam Gandelman 2012-12-07 12:35:35 -08:00
parent 96a37c9493
commit 5bf7673c24
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/rabbitmq-relations
View File

@ -85,7 +85,7 @@ function cluster_joined {
juju-log "rabbitmq-server: ERROR Could not find cookie at $ERLANG_COOKIE"
exit 1
fi
relation-set cookie=$(cat $ERLANG_COOKIE)
relation-set cookie="$(cat $ERLANG_COOKIE)" host="$(hostname)"
}
function cluster_changed {
@ -94,11 +94,11 @@ function cluster_changed {
[[ $local_unit_id -lt $remote_unit_id ]] && echo "Relation lesser" && exit 0
local remote_host=$(relation-get private-address)
local remote_host=$(relation-get host)
local cookie_value=$(relation-get cookie)
[[ -z "$remote_host" ]] || [[ -z "$cookie_value" ]] && \
juju-log "rabbimtq-server: remote_host||cookie_value not yet set." \
juju-log "rabbimtq-server: remote_host||cookie_value not yet set." &&
exit 0
# Sync the erlang cookie to that of remote host.

2
revision
View File

@ -1 +1 @@
37
39