From: carey.xu <carey.xuhan@huawei.com>
Date: Thu, 14 Jan 2016 02:57:37 +0000 (+0800)
Subject: bugfix: mongodb's priority should consistent with keepalived for failover
X-Git-Tag: colorado.1.0~251
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F6621%2F2;p=compass4nfv.git

bugfix: mongodb's priority should consistent with keepalived for failover

JIRA: COMPASS-260

Change-Id: Iafb2f3a853fe05ac12a3275737f5edd1b987ffdd
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml b/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml
index e3a68c55..3e7fe5f7 100755
--- a/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml
+++ b/deploy/adapters/ansible/roles/database/tasks/mongodb_config.yml
@@ -30,7 +30,7 @@
 
 - name: create mongodb user and db
   mongodb_user:
-    login_host: "{{ internal_ip }}"
+    login_host: "{{ internal_vip.ip }}"
     database: ceilometer
     name: ceilometer
     password: "{{ CEILOMETER_DBPASS }}"
@@ -39,7 +39,7 @@
 
 - name: grant user privilege
   mongodb_user:
-    login_host: "{{ internal_ip }}"
+    login_host: "{{ internal_vip.ip }}"
     database: ceilometer
     name: ceilometer
     password: "{{ CEILOMETER_DBPASS }}"
diff --git a/deploy/adapters/ansible/roles/database/templates/replica.js b/deploy/adapters/ansible/roles/database/templates/replica.js
index dd5fc575..7e7072ff 100644
--- a/deploy/adapters/ansible/roles/database/templates/replica.js
+++ b/deploy/adapters/ansible/roles/database/templates/replica.js
@@ -1,8 +1,8 @@
 config = { _id:"compass", members:[
-{% for host in haproxy_hosts.values() %}
+{% for hostname, host in haproxy_hosts.items() %}
 {% set pair = '%s:27017' % host %}
-    {_id:{{ loop.index0 }},host:"{{ pair }}",priority:{{ host_index[inventory_hostname] + 1 }}},
-{% endfor %}
-]
+    {_id:{{ loop.index0 }},host:"{{ pair }}",priority:{{ host_index[hostname] + 1 }}},
+    {% endfor %}
+    ]
 };
 rs.initiate(config);