diff --git a/zaza/openstack/charm_tests/rabbitmq_server/utils.py b/zaza/openstack/charm_tests/rabbitmq_server/utils.py index 3994178..d00f288 100644 --- a/zaza/openstack/charm_tests/rabbitmq_server/utils.py +++ b/zaza/openstack/charm_tests/rabbitmq_server/utils.py @@ -354,9 +354,15 @@ def is_ssl_enabled_on_unit(unit, port=None): host = unit.public_address unit_name = unit.entity_id - conf_file = '/etc/rabbitmq/rabbitmq.config' + conf_file = '/etc/rabbitmq/rabbitmq.conf' conf_contents = str(generic_utils.get_file_contents(unit, conf_file)) + # Fallback to old style configuration file for + # older RMQ releases if .conf is empty/not found + if not conf_contents: + conf_file = '/etc/rabbitmq/rabbitmq.config' + conf_contents = str(generic_utils.get_file_contents(unit, + conf_file)) # Checks conf_ssl = 'ssl' in conf_contents conf_port = str(port) in conf_contents