From e30859a707dad0d43292374aeb346e5044e3be8b Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Thu, 21 Jan 2016 23:30:24 +0800 Subject: bugfix: change opencontrail role name JIRA: COMPASS-284 Change-Id: If47438396124f805efa739bbfdd1c61d4892b4a5 Signed-off-by: chenshuai@huawei.com (cherry picked from commit 6c1adf0e4c442d1a97bb1d4ee5043937e6e596c8) --- .../open-contrail/tasks/provision/provision-database.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml') 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 7ccb5af1..acb06596 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 @@ -54,7 +54,7 @@ set_fact: # dbseeds: "{{ hostvars[item.1][ contrail_address ] }}" dbseeds: "{{ haproxy_hosts[item.1] }}" - with_indexed_items: groups['controller'] + with_indexed_items: groups['opencontrail'] when: item.0 == 0 @@ -66,7 +66,7 @@ set_fact: # dbseeds: "{{ dbseeds }},{{ hostvars[item.1]['contrail_address'] }}" dbseeds: "{{ dbseeds }},{{ haproxy_hosts[item.1] }}" - with_indexed_items: groups['controller'] + with_indexed_items: groups['opencontrail'] when: item.0 == 1 @@ -122,7 +122,7 @@ 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" - with_indexed_items: groups['controller'] + with_indexed_items: groups['opencontrail'] - name: "set zookeeper unique id" @@ -130,7 +130,7 @@ template: src: "../../templates/provision/zookeeper-unique-id.j2" dest: "/var/lib/zookeeper/myid" - with_indexed_items: groups['controller'] + with_indexed_items: groups['opencontrail'] when: item.1 == inventory_hostname @@ -146,7 +146,7 @@ set_fact: # zkaddrs: "{{ hostvars[item.1]['contrail_address'] }}:2181" zkaddrs: "{{ haproxy_hosts[item.1] }}:2181" - with_indexed_items: groups['controller'] + with_indexed_items: groups['opencontrail'] when: item.0 == 0 @@ -155,7 +155,7 @@ set_fact: # zkaddrs: "{{ zkaddrs }},{{ hostvars[item.1]['contrail_address'] }}:2181" zkaddrs: "{{ zkaddrs }},{{ haproxy_hosts[item.1] }}:2181" - with_indexed_items: groups['controller'] + with_indexed_items: groups['opencontrail'] when: item.0 > 0 -- cgit 1.2.3-korg