From ed90c8dde54f99c44ff94a593d7d62505c463b6d Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Fri, 15 Apr 2016 09:57:12 +0800 Subject: opencontrail: data/control plane should be same JIRA: COMPASS-368 Change-Id: Id365065ff985cadcf24938413c1c648a8ab44160 Signed-off-by: chenshuai@huawei.com --- deploy/adapters/ansible/roles/open-contrail/vars/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 eb840cec..17b78849 100755 --- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml @@ -12,13 +12,15 @@ kernel_install: no #ansible_ssh_user: "root" #ansible_ssh_pass: "root" -contrail_keystone_address: "{{ internal_vip.ip }}" +#contrail_keystone_address: "{{ internal_vip.ip }}" +contrail_keystone_address: "{{ public_vip.ip }}" contrail_admin_user: "admin" contrail_admin_password: "console" # network infor adapter for compass -contrail_address: "{{ internal_ip }}" +# contrail_address: "{{ internal_ip }}" +contrail_address: " {{ ip_settings[inventory_hostname]['br-prv']['ip'] }} " #contrail_device: # compass openstack device contrail_netmask: "255.255.255.0" #contrail_gateway: "10.84.50.254" @@ -43,7 +45,8 @@ contrail_vhost_netmask: "{{ ip_settings[inventory_hostname]['br-prv']['netmask'] contrail_keepalived: no #contrail_haproxy_address: "10.0.0.22" # 10.0.0.80 -contrail_haproxy_address: "{{ internal_vip.ip }}" +#contrail_haproxy_address: "{{ internal_vip.ip }}" +contrail_haproxy_address: "{{ public_vip.ip }}" contrail_netmask: "255.255.255.0" contrail_prefixlen: "24" contrail_gateway: "10.0.0.1" -- cgit