From 1420da02369d5db05487ea13e29f47947e07b338 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Fri, 25 Mar 2016 10:06:06 +0800 Subject: opencontrail: move vhost0 on eth1 JIRA: COMPASS-349 Change-Id: I61f481dd9b3aa7885ea3eaa3c7ba2d02c0556d2c Signed-off-by: chenshuai@huawei.com --- deploy/adapters/ansible/roles/open-contrail/vars/main.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/vars') diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml index 94a1423e..eb840cec 100755 --- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml @@ -30,10 +30,10 @@ contrail_gateway: ########################################################### ### we make an independent NIC for OpenContrail vRouter ### ########################################################### -contrail_vhost_device: "eth2" -contrail_vhost_address: "10.18.1." -contrail_vhost_gateway: "10.18.1.254" -contrail_vhost_netmask: "255.255.255.0" +contrail_vhost_device: "{{ network_cfg['provider_net_mappings'][0]['interface'] }}" +contrail_vhost_address: "{{ ip_settings[inventory_hostname]['br-prv']['ip'] }}" +contrail_vhost_gateway: "{{ ip_settings[inventory_hostname]['br-prv']['gw'] }}" +contrail_vhost_netmask: "{{ ip_settings[inventory_hostname]['br-prv']['netmask'] }}" ########################################################### ########################################################### ########################################################### @@ -81,9 +81,3 @@ kernel_package_noarch: [] compute_package_noarch: [] -# network infor adapter for compass -contrail_address: "{{ internal_ip }}" -contrail_netmask: "255.255.255.0" -#contrail_gateway: "10.84.50.254" -contrail_gateway: -#contrail_mgmt_address: "172.27.113.91" -- cgit 1.2.3-korg