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.

hooks/rabbitmq_server_relations.py

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

scripts/health_checks.d/service_rabbitmq_running

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