openstack
/
charm-glance
Code Issues Proposed changes

Clone haproxy resource across all peers & always restart haproxy on config changes.

This commit is contained in:
Adam Gandelman 2013-02-15 12:23:44 -08:00
parent 9ffb92fe9b
commit 827ca55a80
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/glance-relations
View File

@ -324,13 +324,13 @@ function ha_relation_joined() {
init_services="{
'res_glance_haproxy':'haproxy'
}"
groups="{
'grp_glance_haproxy':'res_glance_vip res_glance_haproxy'
clones="{
'cl_glance_haproxy': 'res_glance_haproxy'
}"
relation-set corosync_bindiface=$corosync_bindiface \
corosync_mcastport=$corosync_mcastport \
resources="$resources" resource_params="$resource_params" \
init_services="$init_services" groups="$groups"
init_services="$init_services" clones="$clones"
else
juju-log "Insufficient configuration data to configure hacluster"
exit 1

8
hooks/lib/openstack-common
View File

@ -384,13 +384,7 @@ EOF
done
done
echo "ENABLED=1" > $HAPROXY_DEFAULT
if is_clustered ; then
if is_leader ; then
service haproxy restart
fi
else
service haproxy restart
fi
service haproxy restart
}
##########################################################################

2
revision
View File

@ -1 +1 @@
120
121