diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-24 00:27:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-24 00:27:26 +0000 |
| commit | 260ad5c196617b8a5fde9c23a6cb4884928ac750 (patch) | |
| tree | 12725b009947aa8b0667ebd87e1b0bfef8535225 | |
| parent | 54bd7fbc52f29cd67f115776cc74648b85898297 (diff) | |
| parent | 97a8ba6fd7f0f59aa392573ba9d7107d92f2880d (diff) | |
| download | kolla-260ad5c196617b8a5fde9c23a6cb4884928ac750.tar.gz kolla-260ad5c196617b8a5fde9c23a6cb4884928ac750.zip | |
Merge "Fix incorrect ansible variable"
| -rw-r--r-- | ansible/roles/keystone/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/magnum/tasks/bootstrap.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 37210875d..937939cce 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -31,7 +31,7 @@ priv='{{ keystone_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and + changed_when: "{{ database_user_create.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 diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index 48b9267d0..fda2352c5 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/ansible/roles/magnum/tasks/bootstrap.yml @@ -29,7 +29,7 @@ priv='{{ magnum_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and + changed_when: "{{ database_user_create.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 |