summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/open-contrail/tasks
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-04-15 09:57:12 +0800
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-04-15 09:57:12 +0800
commited90c8dde54f99c44ff94a593d7d62505c463b6d (patch)
tree0f07a2f031dd94c8f1f74dfd7a3a180cdf44b0d9 /deploy/adapters/ansible/roles/open-contrail/tasks
parent06cf46de14100257cc6843c01ffc92216550b06d (diff)
opencontrail: data/control plane should be same
JIRA: COMPASS-368 Change-Id: Id365065ff985cadcf24938413c1c648a8ab44160 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks')
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml4
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml10
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml4
3 files changed, 9 insertions, 9 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml
index c785ad42..e719a461 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml
@@ -24,14 +24,14 @@
lineinfile:
dest: "/etc/ifmap-server/basicauthusers.properties"
# line: "{{ hostvars[item]['contrail_address' ] }}:{{ hostvars[item]['contrail_address' ] }}"
- line: "{{ haproxy_hosts[item] }}:{{ haproxy_hosts[item] }}"
+ line: "{{ ip_settings[item]['br-prv']['ip'] }}:{{ ip_settings[item]['br-prv']['ip'] }}"
with_items: groups['opencontrail']
- name: "modify ifmap server basicauthusers properties for dns"
lineinfile:
dest: "/etc/ifmap-server/basicauthusers.properties"
# line: "{{ hostvars[item]['contrail_address' ] }}.dns:{{ hostvars[item]['contrail_address' ] }}.dns"
- line: "{{ haproxy_hosts[item] }}.dns:{{ haproxy_hosts[item] }}.dns"
+ line: "{{ ip_settings[item]['br-prv']['ip'] }}.dns:{{ ip_settings[item]['br-prv']['ip'] }}.dns"
with_items: groups['opencontrail']
- name: "node-common"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml
index 757aba2b..9c99270d 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml
@@ -61,7 +61,7 @@
# sudo: True
set_fact:
# dbseeds: "{{ hostvars[item.1][ contrail_address ] }}"
- dbseeds: "{{ haproxy_hosts[item.1] }}"
+ dbseeds: "{{ ip_settings[item.1]['br-prv']['ip'] }}"
with_indexed_items: groups['opencontrail']
when: item.0 == 0
@@ -73,7 +73,7 @@
# sudo: True
set_fact:
# dbseeds: "{{ dbseeds }},{{ hostvars[item.1]['contrail_address'] }}"
- dbseeds: "{{ dbseeds }},{{ haproxy_hosts[item.1] }}"
+ dbseeds: "{{ dbseeds }},{{ ip_settings[item.1]['br-prv']['ip'] }}"
with_indexed_items: groups['opencontrail']
when: item.0 == 1
@@ -129,7 +129,7 @@
dest: "/etc/zookeeper/conf/zoo.cfg"
regexp: "server.{{ item.0 + 1 }}="
# line: "server.{{ item.0 + 1 }}={{ hostvars[item.1]['contrail_address'] }}:2888:3888"
- line: "server.{{ item.0 + 1 }}={{ haproxy_hosts[item.1] }}:2888:3888"
+ line: "server.{{ item.0 + 1 }}={{ ip_settings[item.1]['br-prv']['ip'] }}:2888:3888"
with_indexed_items: groups['opencontrail']
@@ -153,7 +153,7 @@
# sudo: True
set_fact:
# zkaddrs: "{{ hostvars[item.1]['contrail_address'] }}:2181"
- zkaddrs: "{{ haproxy_hosts[item.1] }}:2181"
+ zkaddrs: "{{ ip_settings[item.1]['br-prv']['ip'] }}:2181"
with_indexed_items: groups['opencontrail']
when: item.0 == 0
@@ -162,7 +162,7 @@
# sudo: True
set_fact:
# zkaddrs: "{{ zkaddrs }},{{ hostvars[item.1]['contrail_address'] }}:2181"
- zkaddrs: "{{ zkaddrs }},{{ haproxy_hosts[item.1] }}:2181"
+ zkaddrs: "{{ zkaddrs }},{{ ip_settings[item.1]['br-prv']['ip'] }}:2181"
with_indexed_items: groups['opencontrail']
when: item.0 > 0
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml
index 158c0cec..99441b6d 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml
@@ -25,14 +25,14 @@
- name: "set first cassandra host address"
set_fact:
# cassandra_addrs: "'{{ hostvars[item.1]['contrail_address'] }}'"
- cassandra_addrs: "'{{ haproxy_hosts[item.1] }}'"
+ cassandra_addrs: "'{{ ip_settings[item.1]['br-prv']['ip'] }}'"
with_indexed_items: groups['opencontrail']
when: item.0 == 0
- name: "set second or more cassandra host addresses"
set_fact:
# cassandra_addrs: "{{ cassandra_addrs }}, '{{ hostvars[item.1]['contrail_address'] }}'"
- cassandra_addrs: "{{ cassandra_addrs }}, '{{ haproxy_hosts[item.1] }}'"
+ cassandra_addrs: "{{ cassandra_addrs }}, '{{ ip_settings[item.1]['br-prv']['ip'] }}'"
with_indexed_items: groups['opencontrail']
when: item.0 > 0