From: QiLiang <liangqi1@huawei.com>
Date: Wed, 20 Jul 2016 23:04:14 +0000 (+0800)
Subject: Update heat db sync task
X-Git-Tag: colorado.1.0~75^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3c11886942256c365ee690fbea43741ad1e34f44;p=compass4nfv.git

Update heat db sync task

JIRA: COMPASS-442

Change-Id: Id51d8b76d62255cf91b04d4770eb9a4b307ad102
Signed-off-by: QiLiang <liangqi1@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml b/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml
index a24e2f80..911a19ed 100644
--- a/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml
+++ b/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml
@@ -9,7 +9,6 @@
 ---
 - name: heat db sync
   shell: su -s /bin/sh -c "heat-manage db_sync" heat
-  ignore_errors: True
   notify:
     - restart heat service
 
diff --git a/deploy/adapters/ansible/roles/heat/tasks/main.yml b/deploy/adapters/ansible/roles/heat/tasks/main.yml
index 886907eb..8fe31c15 100644
--- a/deploy/adapters/ansible/roles/heat/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/heat/tasks/main.yml
@@ -14,7 +14,7 @@
     - heat
 
 - include: heat_config.yml
-  when: HA_CLUSTER is not defined or HA_CLUSTER[inventory_hostname] == ''
+  when: inventory_hostname == groups['controller'][0]
   tags:
     - config
     - heat_config