openstack/charm-rabbitmq-server
Code Issues Proposed changes

Convert to Juju Charm

Browse Source
This commit is contained in:
Adam Gandelman 2011-09-16 14:55:25 -07:00
parent 9943c42e45
commit 565b4f8838
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/rabbitmq-common
View File

@ -39,18 +39,18 @@ function create_vhost {
} }
function user_create { function user_create {
ensemble-log "rabbitmq: Creating user $1." juju-log "rabbitmq: Creating user $1."
$RABBIT_CTL add_user $1 $PASSWORD || return 1 $RABBIT_CTL add_user $1 $PASSWORD || return 1
# grant the user all permissions on the default vhost / # grant the user all permissions on the default vhost /
# TODO: investigate sane permissions # TODO: investigate sane permissions
ensemble-log "rabbitmq: Granting permission to $1 on vhost /" juju-log "rabbitmq: Granting permission to $1 on vhost /"
$RABBIT_CTL set_permissions -p $VHOST $1 ".*" ".*" ".*" $RABBIT_CTL set_permissions -p $VHOST $1 ".*" ".*" ".*"
if [[ $2 == 'admin' ]] ; then if [[ $2 == 'admin' ]] ; then
user_is_admin $1 && return 0 user_is_admin $1 && return 0
ensemble-log "rabbitmq: Granting user $1 admin access" juju-log "rabbitmq: Granting user $1 admin access"
$RABBIT_CTL set_admin $1 || return 1 $RABBIT_CTL set_admin $1 || return 1
fi fi
} }

22
hooks/rabbitmq-relations
View File

@ -26,11 +26,11 @@ ARG0=${0##*/}
if [[ -e $FORMULA_DIR/rabbitmq-common ]] ; then if [[ -e $FORMULA_DIR/rabbitmq-common ]] ; then
. $FORMULA_DIR/rabbitmq-common . $FORMULA_DIR/rabbitmq-common
else else
ensemble-log "rabbitmq-server: ERROR Could not load $FORMULA_DIR/rabbitmq-common" juju-log "rabbitmq-server: ERROR Could not load $FORMULA_DIR/rabbitmq-common"
exit 1 exit 1
fi fi
ensemble-log "rabbitmq-server: Firing hook $ARG0." juju-log "rabbitmq-server: Firing hook $ARG0."
function install_hook() { function install_hook() {
DEFAULT_ETH=$(ip route | grep default | awk '{ print $5 }') DEFAULT_ETH=$(ip route | grep default | awk '{ print $5 }')
@ -57,10 +57,10 @@ function amqp_changed() {
RABBIT_USER=`relation-get username` RABBIT_USER=`relation-get username`
VHOST=`relation-get vhost` VHOST=`relation-get vhost`
if [[ -z $RABBIT_USER ]] || [[ -z $VHOST ]] ; then if [[ -z $RABBIT_USER ]] || [[ -z $VHOST ]] ; then
ensemble-log "rabbitmq-server: RABBIT_USER||VHOST not yet received from peer." juju-log "rabbitmq-server: RABBIT_USER||VHOST not yet received from peer."
exit 0 exit 0
fi fi
PASSWD_FILE="/var/run/ensemble/$RABBIT_USER.passwd" PASSWD_FILE="/var/run/juju/$RABBIT_USER.passwd"
if [[ -e $PASSWD_FILE ]] ; then if [[ -e $PASSWD_FILE ]] ; then
PASSWORD=$(cat $PASSWD_FILE) PASSWORD=$(cat $PASSWD_FILE)
else else
@ -69,16 +69,16 @@ function amqp_changed() {
chmod 0400 $PASSWD_FILE chmod 0400 $PASSWD_FILE
fi fi
if ! vhost_exists ; then if ! vhost_exists ; then
ensemble-log "rabbitmq-server: Creating vhost $VHOST" juju-log "rabbitmq-server: Creating vhost $VHOST"
create_vhost create_vhost
fi fi
if ! user_exists $RABBIT_USER ; then if ! user_exists $RABBIT_USER ; then
ensemble-log "rabbitmq-server: Creating user $RABBIT_USER" juju-log "rabbitmq-server: Creating user $RABBIT_USER"
user_create $RABBIT_USER admin || exit 1 user_create $RABBIT_USER admin || exit 1
else else
ensemble-log "rabbitmq-server: user $RABBIT_USER already exists." juju-log "rabbitmq-server: user $RABBIT_USER already exists."
fi fi
ensemble-log "rabbitmq-server: Returning credentials for $RABBIT_USER@$HOSTNAME" juju-log "rabbitmq-server: Returning credentials for $RABBIT_USER@$HOSTNAME"
relation-set hostname=$HOSTNAME relation-set hostname=$HOSTNAME
relation-set password=$PASSWORD relation-set password=$PASSWORD
} }
@ -88,7 +88,7 @@ function cluster_joined {
LOCAL_UNIT_ID=$(echo $ENSEMBLE_UNIT_NAME | cut -d/ -f2) LOCAL_UNIT_ID=$(echo $ENSEMBLE_UNIT_NAME | cut -d/ -f2)
[[ $LOCAL_UNIT_ID -gt $REMOTE_UNIT_ID ]] && echo "Relation greater" && exit 0 [[ $LOCAL_UNIT_ID -gt $REMOTE_UNIT_ID ]] && echo "Relation greater" && exit 0
if [[ ! -e $ERLANG_COOKIE ]] ; then if [[ ! -e $ERLANG_COOKIE ]] ; then
ensemble-log "rabbitmq-server: ERROR Could not find cookie at $ERLANG_COOKIE" juju-log "rabbitmq-server: ERROR Could not find cookie at $ERLANG_COOKIE"
exit 1 exit 1
fi fi
relation-set cookie=$(cat $ERLANG_COOKIE) host=$HOSTNAME relation-set cookie=$(cat $ERLANG_COOKIE) host=$HOSTNAME
@ -102,7 +102,7 @@ function cluster_changed {
REMOTE_HOST=$(relation-get host) REMOTE_HOST=$(relation-get host)
COOKIE_VALUE=$(relation-get cookie) COOKIE_VALUE=$(relation-get cookie)
[[ -z $REMOTE_HOST ]] || [[ -z $COOKIE_VALUE ]] && \ [[ -z $REMOTE_HOST ]] || [[ -z $COOKIE_VALUE ]] && \
ensemble-log "rabbimtq-server: REMOTE_HOST||COOKIE_VALUE not yet set." \ juju-log "rabbimtq-server: REMOTE_HOST||COOKIE_VALUE not yet set." \
exit 0 exit 0
service rabbitmq-server stop service rabbitmq-server stop
@ -124,5 +124,5 @@ case $ARG0 in
esac esac
rc=$? rc=$?
ensemble-log "rabbitmq-server: Hook $ARG0 complete. Exiting $rc" juju-log "rabbitmq-server: Hook $ARG0 complete. Exiting $rc"
exit $rc exit $rc