diff options
| -rw-r--r-- | ansible/roles/bootstrap.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/cinder/tasks/bootstrap.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/bootstrap.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/bootstrap.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/bootstrap.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/bootstrap.yml | 6 |
6 files changed, 19 insertions, 18 deletions
diff --git a/ansible/roles/bootstrap.yml b/ansible/roles/bootstrap.yml index d3fdd8354..9fbe64035 100644 --- a/ansible/roles/bootstrap.yml +++ b/ansible/roles/bootstrap.yml @@ -24,9 +24,9 @@ host='%' priv='{{ service_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 - include: start.yml diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 9482b5649..d0b5ae6fc 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -22,9 +22,9 @@ host='%' priv='{{ cinder_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 Cinder data container diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index 49d57f763..cd540486e 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -4,6 +4,7 @@ -m mysql_db -a "login_host='{{ database_address }}' login_user='{{ database_user }}' + login_port='{{ mariadb_port }}' login_password='{{ database_password }}' name='{{ glance_database_name }}'" register: database @@ -22,9 +23,9 @@ host='%' priv='{{ glance_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 Glance data container diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index bad18ed19..d1b9fcfa1 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -24,9 +24,9 @@ host='%' priv='{{ keystone_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 Keystone bootstrap container diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index 74a51b60b..ed53980fc 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -22,9 +22,9 @@ host='%' priv='{{ neutron_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 Neutron bootstrap container diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index e0830ccdf..0a65336f1 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -22,9 +22,9 @@ host='%' priv='{{ nova_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 Nova bootstrap container |