bugfix: annotate the code in annotation in haproxy.cfg.j2

JIRA: COMPASS-237

Change-Id: Ie796dcc07c57aa170ede924551748d8494469239
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

4 files changed, 12 insertions, 6 deletions

diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2
index e4acf3ea..79ba9479 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2
@@ -12,7 +12,9 @@ cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{
 disc_server_ip = {{ contrail_haproxy_address }}
 disc_server_port = 5998
 rabbit_server = {{ contrail_haproxy_address }}
-rabbit_port = 5673
+rabbit_port = 5672
+rabbit_user = {{ RABBIT_USER }}
+rabbit_password = {{ RABBIT_PASS }}
 multi_tenancy = True
 list_optimization_enabled = True
 log_file = /var/log/contrail/contrail-api.log
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2
index 7ab29f6f..2c45d21a 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2
@@ -8,7 +8,9 @@ cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{
 disc_server_ip = {{ contrail_haproxy_address }}
 disc_server_port = 5998
 rabbit_server = {{ contrail_haproxy_address }}
-rabbit_port = 5673
+rabbit_port = 5672
+rabbit_user = {{ RABBIT_USER }} 
+rabbit_password = {{ RABBIT_PASS }} 
 log_file = /var/log/contrail/contrail-device-manager.log
 log_level = SYS_NOTICE
 log_local = 1
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2
index 6ad5ec2d..51740de9 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2
@@ -12,7 +12,9 @@ cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{
 disc_server_ip = {{ contrail_haproxy_address }}
 disc_server_port = 5998
 rabbit_server = {{ contrail_haproxy_address }}
-rabbit_port = 5673
+rabbit_port = 5672
+rabbit_user = {{ RABBIT_USER }}
+rabbit_password = {{ RABBIT_PASS }}
 region_name = RegionOne
 log_file = /var/log/contrail/contrail-svc-monitor.log
 log_level = SYS_NOTICE
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
index 27d033c7..435a4f5c 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
@@ -1,7 +1,7 @@
 #contrail-marker-start
 
 listen contrail-stats
-#   bind *:5937
+#    bind *:5937
     bind {{ internal_vip.ip }}:5937
     bind {{ public_vip.ip }}:5937
     mode http
@@ -12,7 +12,7 @@ listen contrail-stats
 # compass has bind neutron-server
 #listen neutron-server
 #    bind *:9696
-#balance roundrobin
+#    balance roundrobin
 #    option nolinger
 #{% for host,ip in haproxy_hosts.items() %}
 #    server {{ host }} {{ ip }}:9697 weight 1 check inter 2000 rise 2 fall 3
@@ -47,7 +47,7 @@ listen contrail-discovery
 
 
 listen contrail-analytics-api
-#     bind *:8081
+#    bind *:8081
     bind {{ internal_vip.ip }}:8081
     bind {{ public_vip.ip }}:8081
     balance roundrobin