From 79f5076f32c61e8190584a8247a7b076e32382ea Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Thu, 31 Dec 2015 14:25:18 +0800 Subject: bugfix: change all vars' name with "packages" to "package" JIRA: COMPASS-232 Change-Id: I91891076799f9e914c18239cfda143b692c6d9b1 Signed-off-by: chenshuai@huawei.com --- .../roles/open-contrail/tasks/provision/provision-database.yml | 10 +++++----- .../roles/open-contrail/tasks/provision/provision-tsn.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/provision') 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 04a1c993..b20491b5 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 @@ -53,7 +53,7 @@ # sudo: True set_fact: # dbseeds: "{{ hostvars[item.1][ contrail_address ] }}" - dbseeds: "{{ haproxy_hosts[item] }}" + dbseeds: "{{ haproxy_hosts[item.1] }}" with_indexed_items: groups['opencontrail_database'] when: item.0 == 0 @@ -65,7 +65,7 @@ # sudo: True set_fact: # dbseeds: "{{ dbseeds }},{{ hostvars[item.1]['contrail_address'] }}" - dbseeds: "{{ dbseeds }},{{ haproxy_hosts[item] }}" + dbseeds: "{{ dbseeds }},{{ haproxy_hosts[item.1] }}" with_indexed_items: groups['opencontrail_database'] when: item.0 == 1 @@ -121,7 +121,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] }}:2888:3888" + line: "server.{{ item.0 + 1 }}={{ haproxy_hosts[item.1] }}:2888:3888" with_indexed_items: groups['opencontrail_database'] @@ -145,7 +145,7 @@ # sudo: True set_fact: # zkaddrs: "{{ hostvars[item.1]['contrail_address'] }}:2181" - zkaddrs: "{{ haproxy_hosts[item] }}:2181" + zkaddrs: "{{ haproxy_hosts[item.1] }}:2181" with_indexed_items: groups['opencontrail_database'] when: item.0 == 0 @@ -154,7 +154,7 @@ # sudo: True set_fact: # zkaddrs: "{{ zkaddrs }},{{ hostvars[item.1]['contrail_address'] }}:2181" - zkaddrs: "{{ zkaddrs }},{{ haproxy_hosts[item] }}:2181" + zkaddrs: "{{ zkaddrs }},{{ haproxy_hosts[item.1] }}:2181" with_indexed_items: groups['opencontrail_database'] when: item.0 > 0 diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml index 058be18a..33ad6507 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml @@ -39,7 +39,7 @@ - name: "fix up contrail vrouter agent config" template: - src: "provision/contrail-vrouter-agent-conf.j2" + src: "../../templates/provision/contrail-vrouter-agent-conf.j2" dest: "/etc/contrail/contrail-vrouter-agent.conf" - name: "delete lines for contrail interface" -- cgit 1.2.3-korg