diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-18 10:05:58 +0800 |
|---|---|---|
| committer | shuai chen <chenshuai@huawei.com> | 2016-01-21 14:49:30 +0000 |
| commit | d81783305d2837eb2d76f8f3098bd06f2b58a5d2 (patch) | |
| tree | fec57a0b7b505066229eb2aca706b0eb36929cd6 /deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 | |
| parent | 9e1a57ca0b97e49813ae6c19dab7e12c21721717 (diff) | |
bugfix: opencontrail automation deployment scripts
JIRA: COMPASS-277
Change-Id: Ia1f52c6e8e3de520cf06de99550c17879aaed2d7
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit 77944ac2791a631cfa785d16cc32dae8082b2719)
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2')
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
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 d0d6b966..61a517c9 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_vhost_device]['macaddress'] }} +physical_interface_mac = {{ hostvars[inventory_hostname]['ansible_'+contrail_vhost_device]['macaddress'] }} [DISCOVERY] # If COLLECTOR and/or CONTROL-NODE and/or DNS is not specified this section is @@ -77,7 +77,7 @@ server = {{ contrail_haproxy_address }} # Number of control-nodes info to be provided by Discovery service. Possible # values are 1 and 2 -max_control_nodes = {{ groups['opencontrail_control'] | length }} +max_control_nodes = {{ groups['controller'] | length }} [DNS] # IP address and port to be used to connect to dns-node. Maximum of 2 IP @@ -127,7 +127,7 @@ control_network_ip = {{ contrail_haproxy_address }} name = vhost0 # IP address and prefix in ip/prefix_len format -ip = {{ contraili_vhost_address }}/{{ contrail_prefixlen }} +ip = {{ contrail_vhost_address }}/{{ contrail_prefixlen }} # Gateway IP address for virtual host gateway = {{ contrail_vhost_gateway }} |