From 6c48d465b98f2255d5374903df8c73dbc4e9adaf Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Sat, 16 Jan 2016 01:35:52 +0800 Subject: bugfix: workaround for opencontrail JIRA: COMPASS-271 Change-Id: Ib4bbc0536ed8877f5e38150e5d710578345ac56b Signed-off-by: chenshuai@huawei.com (cherry picked from commit 6b168a9b8c44c141f71c2eab7e51973f3523f912) --- .../templates/provision/contrail-analytics-api-conf.j2 | 4 ++-- .../templates/provision/contrail-api-supervisord-conf.j2 | 2 +- .../templates/provision/contrail-discovery-supervisord-conf.j2 | 2 +- .../open-contrail/templates/provision/contrail-schema-conf.j2 | 4 ++-- .../templates/provision/contrail-vrouter-agent-conf.j2 | 8 ++++---- .../open-contrail/templates/provision/haproxy-contrail-cfg.j2 | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/templates') diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 index 6e2bcce3..3ac84c33 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 @@ -1,12 +1,12 @@ [DEFAULTS] host_ip = {{ contrail_address }} rest_api_ip = {{ contrail_haproxy_address }} -rest_api_port = 9081 +rest_api_port = 8081 #cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{ ip_settings[cur_host]['mgmt']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} #chenshuai: This kind of written is also correct, but the following is better, this as record cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{ haproxy_hosts[cur_host] }}:9160{% if not loop.last %} {% endif %}{% endfor %} -collectors = {{ contrail_address }}:8086 +collectors = {{ contrail_haproxy_address }}:8086 http_server_port = 8090 log_file = /var/log/contrail/contrail-analytics-api.log log_level = SYS_NOTICE diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 index 94da3d71..ad3e0387 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 @@ -1,5 +1,5 @@ [program:contrail-api] -command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --listen_port 910%(process_num)01d --worker_id %(process_num)s +command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --worker_id %(process_num)s numprocs=1 process_name=%(process_num)s redirect_stderr=true diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 index 5f0a698d..541568de 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 @@ -1,5 +1,5 @@ [program:contrail-discovery] -command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --listen_port 911%(process_num)01d --worker_id %(process_num)s +command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --worker_id %(process_num)s numprocs=1 process_name=%(process_num)s redirect_stderr=true diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 index cf5dead3..46995f75 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 @@ -1,11 +1,11 @@ [DEFAULTS] #ifmap_server_ip = {{ ip_settings[haproxy_hosts.keys()[0]]['mgmt']['ip'] }} -ifmap_server_ip = {{ haproxy_hosts.values()[0] }} +ifmap_server_ip = {{ contrail_haproxy_address }} ifmap_server_port = 8443 ifmap_username = schema-transformer ifmap_password = schema-transformer #api_server_ip = {{ ip_settings[haproxy_hosts.keys()[0]]['mgmt']['ip'] }} -api_server_ip = {{ haproxy_hosts.values()[0] }} +api_server_ip = {{ contrail_haproxy_address }} api_server_port = 8082 zk_server_ip = {% for cur_host in groups['opencontrail_database'] %}{{ haproxy_hosts[cur_host] }}:2181{% if not loop.last %}, {% endif %}{% endfor %} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 index 207509e5..78b31775 100755 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 +++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 @@ -66,7 +66,7 @@ platform = default physical_interface_address = # MAC address of device used by dpdk -physical_interface_mac = {{ hostvars[inventory_hostname][contrail_ansible_device]['macaddress'] }} +physical_interface_mac = {{ hostvars[inventory_hostname][contrail_device]['macaddress'] }} [DISCOVERY] # If COLLECTOR and/or CONTROL-NODE and/or DNS is not specified this section is @@ -118,7 +118,7 @@ vmware_physical_interface = [NETWORKS] # control-channel IP address used by WEB-UI to connect to vnswad to fetch # required information (Optional) -control_network_ip = {{ contrail_address }} +control_network_ip = {{ contrail_haproxy_address }} [VIRTUAL-HOST-INTERFACE] # Everything in this section is mandatory @@ -127,10 +127,10 @@ control_network_ip = {{ contrail_address }} name = vhost0 # IP address and prefix in ip/prefix_len format -ip = {{ contrail_address }}/{{ contrail_prefixlen }} +ip = {{ contraili_vhost_address }}/{{ contrail_prefixlen }} # Gateway IP address for virtual host -gateway = {{ contrail_gateway }} +gateway = {{ contrail_vhost_gateway }} # Physical interface name to which virtual host interface maps to physical_interface = {{ contrail_device }} 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 435a4f5c..01196369 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 @@ -29,7 +29,7 @@ listen contrail-api timeout client 3m timeout server 3m {% for host,ip in haproxy_hosts.items() %} - server {{ host }} {{ ip }}:9100 weight 1 check inter 2000 rise 2 fall 3 + server {{ host }} {{ ip }}:8082 weight 1 check inter 2000 rise 2 fall 3 {% endfor %} @@ -41,7 +41,7 @@ listen contrail-discovery balance roundrobin option nolinger {% for host,ip in haproxy_hosts.items() %} - server {{ host }} {{ ip }}:9110 weight 1 check inter 2000 rise 2 fall 3 + server {{ host }} {{ ip }}:5998 weight 1 check inter 2000 rise 2 fall 3 {% endfor %} @@ -56,7 +56,7 @@ listen contrail-analytics-api tcp-check connect port 6379 default-server error-limit 1 on-error mark-down {% for host,ip in haproxy_hosts.items() %} - server {{ host }} {{ ip }}:9081 weight 1 check inter 2000 rise 2 fall 5 + server {{ host }} {{ ip }}:8081 weight 1 check inter 2000 rise 2 fall 5 {% endfor %} -- cgit 1.2.3-korg