diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml')
-rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml | 16 |
1 files changed, 9 insertions, 7 deletions
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 f95e7feb..04a1c993 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 @@ -20,8 +20,10 @@ # sudo: True lineinfile: dest: "/etc/hosts" - regexp: "^{{ contrail_address }}\t{{ ansible_hostname }}( .*)?$" - line: "{{ contrail_address }}\t{{ ansible_hostname }}\\1" +# regexp: "^{{ contrail_address }}\t{{ ansible_hostname }}( .*)?$" +# line: "{{ contrail_address }}\t{{ ansible_hostname }}\\1" + regexp: "^{{ contrail_address }}\t{{ inventory_hostname }}( .*)?$" + line: "{{ contrail_address }}\t{{ inventory_hostname }}\\1" backrefs: yes @@ -51,7 +53,7 @@ # sudo: True set_fact: # dbseeds: "{{ hostvars[item.1][ contrail_address ] }}" - dbseeds: "{{ contrail_address }}" + dbseeds: "{{ haproxy_hosts[item] }}" with_indexed_items: groups['opencontrail_database'] when: item.0 == 0 @@ -63,7 +65,7 @@ # sudo: True set_fact: # dbseeds: "{{ dbseeds }},{{ hostvars[item.1]['contrail_address'] }}" - dbseeds: "{{ dbseeds }},{{ contrail_address }}" + dbseeds: "{{ dbseeds }},{{ haproxy_hosts[item] }}" with_indexed_items: groups['opencontrail_database'] when: item.0 == 1 @@ -119,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 }}={{ contrail_address }}:2888:3888" + line: "server.{{ item.0 + 1 }}={{ haproxy_hosts[item] }}:2888:3888" with_indexed_items: groups['opencontrail_database'] @@ -143,7 +145,7 @@ # sudo: True set_fact: # zkaddrs: "{{ hostvars[item.1]['contrail_address'] }}:2181" - zkaddrs: "{{ contrail_address }}:2181" + zkaddrs: "{{ haproxy_hosts[item] }}:2181" with_indexed_items: groups['opencontrail_database'] when: item.0 == 0 @@ -152,7 +154,7 @@ # sudo: True set_fact: # zkaddrs: "{{ zkaddrs }},{{ hostvars[item.1]['contrail_address'] }}:2181" - zkaddrs: "{{ zkaddrs }},{{ contrail_address }}:2181" + zkaddrs: "{{ zkaddrs }},{{ haproxy_hosts[item] }}:2181" with_indexed_items: groups['opencontrail_database'] when: item.0 > 0 |