diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-21 12:29:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-21 12:29:22 +0000 |
| commit | bb7a36cbac02a1345e61b29f83cadc6434274249 (patch) | |
| tree | af4dc8da8e028d01b710fb8034dc1c9fb8efedc6 /deploy/adapters/ansible/roles/open-contrail/vars/main.yml | |
| parent | 34a1302918127f0cc08b2d005dd42ac373f253ef (diff) | |
| parent | 6c48d465b98f2255d5374903df8c73dbc4e9adaf (diff) | |
Merge "bugfix: workaround for opencontrail" into stable/brahmaputra
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/vars/main.yml')
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/vars/main.yml | 16 |
1 files changed, 14 insertions, 2 deletions
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" |