From bcde30f379d03d7c519231f6f9057071158f0d4b Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Thu, 3 Sep 2015 14:34:17 -0400 Subject: [PATCH] Use database_user_create in Heat bootstrap The register operation was using database_user which is also a global variable in group_vars/all.yml. This results in Heat being undeployable because database_user is overwritten. Change-Id: I78b2db34b7c99142040390c7258b7e81d3770835 Closes-bug: #1491980 --- ansible/roles/heat/tasks/bootstrap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index b43b4dccb4..55ca525a1f 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/ansible/roles/heat/tasks/bootstrap.yml @@ -22,9 +22,9 @@ host='%' priv='{{ heat_database_name }}.*:ALL' append_privs='yes'" - register: database_user - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - failed_when: database_user.stdout.split()[2] != 'SUCCESS' + register: database_user_create + changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + failed_when: database_user_create.stdout.split()[2] != 'SUCCESS' run_once: True - name: Starting Heat bootstrap container