Allow specify RabbitMQ connection for Contail
This patch allows the operator to specify
address and credentials for Contrail's MQ
connection. It uses the same data format,
that is being used to specify MQ connection
parameters for OpenStack components, eg:
opencontrail:
control:
message_queue:
user: nova
virtual_host: "/"
password: rabbit
Change-Id: Ic5dd8fc1f6fa89e9420382933cf3cea0eb2ed67d
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
diff --git a/opencontrail/files/3.0/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
index c58f273..64aebc6 100644
--- a/opencontrail/files/3.0/contrail-api.conf
+++ b/opencontrail/files/3.0/contrail-api.conf
@@ -27,6 +27,15 @@
auth=keystone
{%- endif %}
#rabbit_port=5673{{ config.message_queue.port }}
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
[SECURITY]
use_certs=False
diff --git a/opencontrail/files/3.0/contrail-device-manager.conf b/opencontrail/files/3.0/contrail-device-manager.conf
index 44fcb9b..17dd445 100644
--- a/opencontrail/files/3.0/contrail-device-manager.conf
+++ b/opencontrail/files/3.0/contrail-device-manager.conf
@@ -7,6 +7,15 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
api_server_ip={{ config.discovery.host }}
api_server_port=8082
zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
diff --git a/opencontrail/files/3.0/contrail-schema.conf b/opencontrail/files/3.0/contrail-schema.conf
index 2ecfb0b..188a6bf 100644
--- a/opencontrail/files/3.0/contrail-schema.conf
+++ b/opencontrail/files/3.0/contrail-schema.conf
@@ -21,6 +21,15 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
[SECURITY]
use_certs=False
diff --git a/opencontrail/files/3.0/contrail-svc-monitor.conf b/opencontrail/files/3.0/contrail-svc-monitor.conf
index 860ad12..28546ee 100644
--- a/opencontrail/files/3.0/contrail-svc-monitor.conf
+++ b/opencontrail/files/3.0/contrail-svc-monitor.conf
@@ -23,6 +23,15 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
[SCHEDULER]
analytics_server_ip={{ config.analytics.host }}
diff --git a/opencontrail/files/4.0/contrail-api.conf b/opencontrail/files/4.0/contrail-api.conf
index d4045ca..729a6e3 100644
--- a/opencontrail/files/4.0/contrail-api.conf
+++ b/opencontrail/files/4.0/contrail-api.conf
@@ -23,6 +23,15 @@
auth=keystone
{%- endif %}
#rabbit_port=5673
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
# (StrOpt) default encoding to use for string resources.
# this is optional variable. Define it if you want to override
diff --git a/opencontrail/files/4.0/contrail-device-manager.conf b/opencontrail/files/4.0/contrail-device-manager.conf
index 80ffb9c..9d4ac45 100644
--- a/opencontrail/files/4.0/contrail-device-manager.conf
+++ b/opencontrail/files/4.0/contrail-device-manager.conf
@@ -7,6 +7,15 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
api_server_ip={{ config.api.host }}
api_server_port=8082
zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
diff --git a/opencontrail/files/4.0/contrail-schema.conf b/opencontrail/files/4.0/contrail-schema.conf
index 1824708..40c06fa 100644
--- a/opencontrail/files/4.0/contrail-schema.conf
+++ b/opencontrail/files/4.0/contrail-schema.conf
@@ -15,6 +15,15 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
collectors = {% for member in config.analytics.members %}{{ member.host }}:8086 {% endfor %}
[SECURITY]
diff --git a/opencontrail/files/4.0/contrail-svc-monitor.conf b/opencontrail/files/4.0/contrail-svc-monitor.conf
index b55d24c..d86f2dd 100644
--- a/opencontrail/files/4.0/contrail-svc-monitor.conf
+++ b/opencontrail/files/4.0/contrail-svc-monitor.conf
@@ -18,6 +18,15 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
+{%- if config.message_queue.virtual_host is defined %}
+rabbit_vhost={{config.message_queue.virtual_host}}
+{%- endif %}
+{%- if config.message_queue.user is defined %}
+rabbit_user={{config.message_queue.user}}
+{%- endif %}
+{%- if config.message_queue.password is defined %}
+rabbit_password={{config.message_queue.password}}
+{%- endif %}
collectors={% for member in config.analytics.members %}{{ member.host }}:8086 {% endfor %}
[SCHEDULER]