RabbitMQ defaults
PROD-21151
Change-Id: I54b272cf320d70e03bac4d9fdb79c9b5a9da81d0
diff --git a/opencontrail/files/3.0/contrail-alarm-gen.conf b/opencontrail/files/3.0/contrail-alarm-gen.conf
index d14cab0..026a903 100644
--- a/opencontrail/files/3.0/contrail-alarm-gen.conf
+++ b/opencontrail/files/3.0/contrail-alarm-gen.conf
@@ -15,11 +15,13 @@
{%- if collector.get('message_queue', {}).members is defined %}
rabbitmq_server_list={{ collector.message_queue.members | join(',', attribute='host') }}
rabbitmq_ha_mode=True
-rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
{%- elif collector.get('message_queue', {}).host is defined %}
rabbitmq_server_list={{ collector.message_queue.host }}
-rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
{%- endif %}
+rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
+rabbitmq_user={{ collector.get('message_queue', {}).get('user', 'guest') }}
+rabbitmq_password={{ collector.get('message_queue', {}).get('password', 'guest') }}
+rabbitmq_vhost={{ collector.get('message_queue', {}).get('vhost', '') }}
[DISCOVERY]
disc_server_ip = {{ collector.discovery.host }}
diff --git a/opencontrail/files/4.0/contrail-alarm-gen.conf b/opencontrail/files/4.0/contrail-alarm-gen.conf
index ae8ea5e..e0c51a3 100644
--- a/opencontrail/files/4.0/contrail-alarm-gen.conf
+++ b/opencontrail/files/4.0/contrail-alarm-gen.conf
@@ -14,12 +14,13 @@
{%- if collector.get('message_queue', {}).members is defined %}
rabbitmq_server_list={{ collector.message_queue.members | join(',', attribute='host') }}
rabbitmq_ha_mode=True
-rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
{%- elif collector.get('message_queue', {}).host is defined %}
rabbitmq_server_list={{ collector.message_queue.host }}
-rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
{%- endif %}
-
+rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
+rabbitmq_user={{ collector.get('message_queue', {}).get('user', 'guest') }}
+rabbitmq_password={{ collector.get('message_queue', {}).get('password', 'guest') }}
+rabbitmq_vhost={{ collector.get('message_queue', {}).get('vhost', '') }}
[API_SERVER]
# List of api-servers in ip:port format separated by space