aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-07-21 08:10:12 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-21 08:10:12 +0000
commit72d0c28f4c695870ed17c134c51d471853a3f84e (patch)
treebd1e41c3a9b5000bc4263569b57735d764550df4
parent80a803d3dc68f1e928321b7ccfa02bda92043fe8 (diff)
parent3c11886942256c365ee690fbea43741ad1e34f44 (diff)
Merge "Update heat db sync task"
-rw-r--r--deploy/adapters/ansible/roles/heat/tasks/heat_config.yml1
-rw-r--r--deploy/adapters/ansible/roles/heat/tasks/main.yml2
2 files changed, 1 insertions, 2 deletions
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