openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Health check fixes 

- Don't monitor port 5671 as it is only on master
- Use /etc/init.d script rather than service command, which is borken.
This commit is contained in:
Jerry Seutter 2013-04-02 10:04:48 -06:00
parent 018d3a108c
commit b786a5f468
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/rabbitmq_server_relations.py
View File

@ -172,7 +172,6 @@ def ha_joined():
'OPENSTACK_SERVICE_RABBIT': 'rabbitmq-server', 'OPENSTACK_SERVICE_RABBIT': 'rabbitmq-server',
'OPENSTACK_PORT_EPMD': 4369, 'OPENSTACK_PORT_EPMD': 4369,
'OPENSTACK_PORT_MCASTPORT': utils.config_get('ha-mcastport'), 'OPENSTACK_PORT_MCASTPORT': utils.config_get('ha-mcastport'),
'OPENSTACK_PORT_SSL': utils.config_get('ssl_port'),
} }
openstack.save_script_rc(**env_vars) openstack.save_script_rc(**env_vars)

2
scripts/health_checks.d/service_rabbitmq_running
View File

@ -9,5 +9,5 @@ set -e
openstack_service_names=`env| awk -F '=' '(/OPENSTACK_SERVICE/){print $2}'` openstack_service_names=`env| awk -F '=' '(/OPENSTACK_SERVICE/){print $2}'`
for service_name in $openstack_service_names for service_name in $openstack_service_names
do do
service $service_name status /etc/init.d/$service_name status > /dev/null
done done