Fix the database user name for all roles

when create database user, it should use
database_user, not database_name.

Change-Id: I4dfa01d1a5a46c5c58f1fc47b0be71b186462764
Closes-Bug: #1698762

ansible/roles/aodh/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ aodh_database_name }}"
+      name: "{{ aodh_database_user }}"
       password: "{{ aodh_database_password }}"
       host: "%"
       priv: "{{ aodh_database_name }}.*:ALL"

ansible/roles/barbican/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ barbican_database_name }}"
+      name: "{{ barbican_database_user }}"
       password: "{{ barbican_database_password }}"
       host: "%"
       priv: "{{ barbican_database_name }}.*:ALL"

ansible/roles/ceilometer/tasks/bootstrap.yml

@@ -49,7 +49,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ ceilometer_database_name }}"
+      name: "{{ ceilometer_database_user }}"
       password: "{{ ceilometer_database_password }}"
       host: "%"
       priv: "{{ ceilometer_database_name }}.*:ALL"

ansible/roles/cinder/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ cinder_database_name }}"
+      name: "{{ cinder_database_user }}"
       password: "{{ cinder_database_password }}"
       host: "%"
       priv: "{{ cinder_database_name }}.*:ALL"

ansible/roles/cloudkitty/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ cloudkitty_database_name }}"
+      name: "{{ cloudkitty_database_user }}"
       password: "{{ cloudkitty_database_password }}"
       host: "%"
       priv: "{{ cloudkitty_database_name }}.*:ALL"

ansible/roles/congress/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ congress_database_name }}"
+      name: "{{ congress_database_user }}"
       password: "{{ congress_database_password }}"
       host: "%"
       priv: "{{ congress_database_name }}.*:ALL"

ansible/roles/designate/tasks/bootstrap.yml

@@ -23,7 +23,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ item.database_name }}"
+      name: "{{ item.database_user }}"
       password: "{{ item.database_password }}"
       host: "%"
       priv: "{{ item.database_name }}.*:ALL"
@@ -32,8 +32,10 @@
   delegate_to: "{{ groups['designate-central'][0] }}"
   with_items:
     - database_name: "{{ designate_database_name }}"
+      database_user: "{{ designate_database_user }}"
       database_password: "{{ designate_database_password }}"
     - database_name: "{{ designate_pool_manager_database_name }}"
+      database_user: "{{ designate_pool_manager_database_user }}"
       database_password: "{{ designate_pool_manager_database_password }}"
 
 - include: bootstrap_service.yml

ansible/roles/glance/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ glance_database_name }}"
+      name: "{{ glance_database_user }}"
       password: "{{ glance_database_password }}"
       host: "%"
       priv: "{{ glance_database_name }}.*:ALL"

ansible/roles/gnocchi/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ gnocchi_database_name }}"
+      name: "{{ gnocchi_database_user }}"
       password: "{{ gnocchi_database_password }}"
       host: "%"
       priv: "{{ gnocchi_database_name }}.*:ALL"

ansible/roles/grafana/tasks/bootstrap.yml

@@ -19,7 +19,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ grafana_database_name }}"
+      name: "{{ grafana_database_user }}"
       password: "{{ grafana_database_password }}"
       host: "%"
       priv: "{{ grafana_database_name }}.*:ALL"

ansible/roles/heat/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ heat_database_name }}"
+      name: "{{ heat_database_user }}"
       password: "{{ heat_database_password }}"
       host: "%"
       priv: "{{ heat_database_name }}.*:ALL"

ansible/roles/horizon/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ horizon_database_name }}"
+      name: "{{ horizon_database_user }}"
       password: "{{ horizon_database_password }}"
       host: "%"
       priv: "{{ horizon_database_name }}.*:ALL"

ansible/roles/ironic/tasks/bootstrap.yml

@@ -25,7 +25,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ item.database_name }}"
+      name: "{{ item.database_user }}"
       password: "{{ item.database_password }}"
       host: "%"
       priv: "{{ item.database_name }}.*:ALL"
@@ -34,9 +34,11 @@
   delegate_to: "{{ item.delegate_to }}"
   with_items:
     - database_name: "{{ ironic_database_name }}"
+      database_user: "{{ ironic_database_user }}"
       database_password: "{{ ironic_database_password }}"
       delegate_to: "{{ groups['ironic-api'][0] }}"
     - database_name: "{{ ironic_inspector_database_name }}"
+      database_user: "{{ ironic_inspector_database_user }}"
       database_password: "{{ ironic_inspector_database_password }}"
       delegate_to: "{{ groups['ironic-inspector'][0] }}"
 

ansible/roles/karbor/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ karbor_database_name }}"
+      name: "{{ karbor_database_user }}"
       password: "{{ karbor_database_password }}"
       host: "%"
       priv: "{{ karbor_database_name }}.*:ALL"

ansible/roles/keystone/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ keystone_database_name }}"
+      name: "{{ keystone_database_user }}"
       password: "{{ keystone_database_password }}"
       host: "%"
       priv: "{{ keystone_database_name }}.*:ALL"

ansible/roles/magnum/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ magnum_database_name }}"
+      name: "{{ magnum_database_user }}"
       password: "{{ magnum_database_password }}"
       host: "%"
       priv: "{{ magnum_database_name }}.*:ALL"

ansible/roles/manila/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ manila_database_name }}"
+      name: "{{ manila_database_user }}"
       password: "{{ manila_database_password }}"
       host: "%"
       priv: "{{ manila_database_name }}.*:ALL"

ansible/roles/mistral/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ mistral_database_name }}"
+      name: "{{ mistral_database_user }}"
       password: "{{ mistral_database_password }}"
       host: "%"
       priv: "{{ mistral_database_name }}.*:ALL"

ansible/roles/murano/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ murano_database_name }}"
+      name: "{{ murano_database_user }}"
       password: "{{ murano_database_password }}"
       host: "%"
       priv: "{{ murano_database_name }}.*:ALL"

ansible/roles/neutron/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ neutron_database_name }}"
+      name: "{{ neutron_database_user }}"
       password: "{{ neutron_database_password }}"
       host: "%"
       priv: "{{ neutron_database_name }}.*:ALL"

ansible/roles/nova/tasks/bootstrap.yml

@@ -32,13 +32,13 @@
   register: database_user_create
   with_items:
     - database_name: "{{ nova_database_name }}"
-      database_username: "{{ nova_database_name }}"
+      database_username: "{{ nova_database_user }}"
       database_password: "{{ nova_database_password }}"
     - database_name: "{{ nova_database_name }}_cell0"
-      database_username: "{{ nova_database_name }}"
+      database_username: "{{ nova_database_user }}"
       database_password: "{{ nova_database_password }}"
     - database_name: "{{ nova_api_database_name }}"
-      database_username: "{{ nova_api_database_name }}"
+      database_username: "{{ nova_api_database_user }}"
       database_password: "{{ nova_api_database_password }}"
   run_once: True
   delegate_to: "{{ groups['nova-api'][0] }}"

ansible/roles/octavia/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ octavia_database_name }}"
+      name: "{{ octavia_database_user }}"
       password: "{{ octavia_database_password }}"
       host: "%"
       priv: "{{ octavia_database_name }}.*:ALL"

ansible/roles/panko/tasks/bootstrap.yml

@@ -32,7 +32,7 @@
       login_port: "{{ panko_database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ panko_database_name }}"
+      name: "{{ panko_database_user }}"
       password: "{{ panko_database_password }}"
       host: "%"
       priv: "{{ panko_database_name }}.*:ALL"

ansible/roles/rally/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ rally_database_name }}"
+      name: "{{ rally_database_user }}"
       password: "{{ rally_database_password }}"
       host: "%"
       priv: "{{ rally_database_name }}.*:ALL"

ansible/roles/sahara/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ sahara_database_name }}"
+      name: "{{ sahara_database_user }}"
       password: "{{ sahara_database_password }}"
       host: "%"
       priv: "{{ sahara_database_name }}.*:ALL"

ansible/roles/senlin/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ senlin_database_name }}"
+      name: "{{ senlin_database_user }}"
       password: "{{ senlin_database_password }}"
       host: "%"
       priv: "{{ senlin_database_name }}.*:ALL"

ansible/roles/solum/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ solum_database_name }}"
+      name: "{{ solum_database_user }}"
       password: "{{ solum_database_password }}"
       host: "%"
       priv: "{{ solum_database_name }}.*:ALL"

ansible/roles/tacker/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ tacker_database_name }}"
+      name: "{{ tacker_database_user }}"
       password: "{{ tacker_database_password }}"
       host: "%"
       priv: "{{ tacker_database_name }}.*:ALL"

ansible/roles/trove/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ trove_database_name }}"
+      name: "{{ trove_database_user }}"
       password: "{{ trove_database_password }}"
       host: "%"
       priv: "{{ trove_database_name }}.*:ALL"

ansible/roles/watcher/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ watcher_database_name }}"
+      name: "{{ watcher_database_user }}"
       password: "{{ watcher_database_password }}"
       host: "%"
       priv: "{{ watcher_database_name }}.*:ALL"

ansible/roles/zun/tasks/bootstrap.yml

@@ -20,7 +20,7 @@
       login_port: "{{ database_port }}"
       login_user: "{{ database_user }}"
       login_password: "{{ database_password }}"
-      name: "{{ zun_database_name }}"
+      name: "{{ zun_database_user }}"
       password: "{{ zun_database_password }}"
       host: "%"
       priv: "{{ zun_database_name }}.*:ALL"