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) --- .../adapters/ansible/roles/open-contrail/vars/main.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/vars/main.yml') diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml index e19b1fbf..41a1bf8f 100755 --- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml @@ -10,8 +10,8 @@ contrail_admin_password: "console" # network infor adapter for compass -contrail_device: "mgmt" contrail_address: "{{ internal_ip }}" +#contrail_device: # compass openstack device contrail_netmask: "255.255.255.0" #contrail_gateway: "10.84.50.254" contrail_gateway: @@ -19,6 +19,19 @@ contrail_gateway: +########################################################### +### we make an independent NIC for OpenContrail vRouter ### +########################################################### +contrail_vhost_device: "eth2" +contrail_vhost_address: +contrail_vhost_gateway: +########################################################### +########################################################### +########################################################### + + + + contrail_keepalived: no #contrail_haproxy_address: "10.0.0.22" # 10.0.0.80 contrail_haproxy_address: "{{ internal_vip.ip }}" @@ -60,7 +73,6 @@ kernel_package_noarch: [] compute_package_noarch: [] # network infor adapter for compass -contrail_device: "mgmt" contrail_address: "{{ internal_ip }}" contrail_netmask: "255.255.255.0" #contrail_gateway: "10.84.50.254" -- cgit 1.2.3-korg