diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-09 10:55:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-09 10:55:01 +0000 |
| commit | 817b31231c29d689a91137d10d8d1a5c076f0657 (patch) | |
| tree | 4cdf622f62ff14549f6be8851988e972c30905d1 | |
| parent | 33d39f29421bec986b96b112d11cc8caa36a896d (diff) | |
| parent | 6b283430173caf0d0ecabce55dfa62abfe68787a (diff) | |
| download | kolla-817b31231c29d689a91137d10d8d1a5c076f0657.tar.gz kolla-817b31231c29d689a91137d10d8d1a5c076f0657.zip | |
Merge "Incorrect parsed variable name"
| -rw-r--r-- | ansible/roles/cinder/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/heat/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/murano/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/bootstrap.yml | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index b0a949f8f..cf8f43413 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -23,7 +23,7 @@ priv='{{ cinder_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index fe62557bd..77a391460 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -24,7 +24,7 @@ priv='{{ glance_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index 0c8e3920b..7a00dd931 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/ansible/roles/heat/tasks/bootstrap.yml @@ -23,7 +23,7 @@ priv='{{ heat_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 0d55efc45..1e63a1a37 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -25,7 +25,7 @@ priv='{{ ironic_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 34ee7b31a..8056796ab 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -25,7 +25,7 @@ priv='{{ keystone_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index 5d73debc7..a6c08baa8 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/ansible/roles/murano/tasks/bootstrap.yml @@ -24,7 +24,7 @@ priv='{{ murano_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index 36b4f9647..ebb6cab5d 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -23,7 +23,7 @@ priv='{{ neutron_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index d81dddc3a..7b7a5ed16 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -23,7 +23,7 @@ priv='{{ nova_database_name }}.*:ALL' append_privs='yes'" register: database_user_create - changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + 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 |
