From 36c530f9ed1fa1b2a4ad2647b5c80c23e1659fad Mon Sep 17 00:00:00 2001 From: caoyuan Date: Mon, 19 Jun 2017 14:24:48 +0800 Subject: [PATCH] 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 | 2 +- ansible/roles/barbican/tasks/bootstrap.yml | 2 +- ansible/roles/ceilometer/tasks/bootstrap.yml | 2 +- ansible/roles/cinder/tasks/bootstrap.yml | 2 +- ansible/roles/cloudkitty/tasks/bootstrap.yml | 2 +- ansible/roles/congress/tasks/bootstrap.yml | 2 +- ansible/roles/designate/tasks/bootstrap.yml | 4 +++- ansible/roles/glance/tasks/bootstrap.yml | 2 +- ansible/roles/gnocchi/tasks/bootstrap.yml | 2 +- ansible/roles/grafana/tasks/bootstrap.yml | 2 +- ansible/roles/heat/tasks/bootstrap.yml | 2 +- ansible/roles/horizon/tasks/bootstrap.yml | 2 +- ansible/roles/ironic/tasks/bootstrap.yml | 4 +++- ansible/roles/karbor/tasks/bootstrap.yml | 2 +- ansible/roles/keystone/tasks/bootstrap.yml | 2 +- ansible/roles/magnum/tasks/bootstrap.yml | 2 +- ansible/roles/manila/tasks/bootstrap.yml | 2 +- ansible/roles/mistral/tasks/bootstrap.yml | 2 +- ansible/roles/murano/tasks/bootstrap.yml | 2 +- ansible/roles/neutron/tasks/bootstrap.yml | 2 +- ansible/roles/nova/tasks/bootstrap.yml | 6 +++--- ansible/roles/octavia/tasks/bootstrap.yml | 2 +- ansible/roles/panko/tasks/bootstrap.yml | 2 +- ansible/roles/rally/tasks/bootstrap.yml | 2 +- ansible/roles/sahara/tasks/bootstrap.yml | 2 +- ansible/roles/senlin/tasks/bootstrap.yml | 2 +- ansible/roles/solum/tasks/bootstrap.yml | 2 +- ansible/roles/tacker/tasks/bootstrap.yml | 2 +- ansible/roles/trove/tasks/bootstrap.yml | 2 +- ansible/roles/watcher/tasks/bootstrap.yml | 2 +- ansible/roles/zun/tasks/bootstrap.yml | 2 +- 31 files changed, 37 insertions(+), 33 deletions(-) diff --git a/ansible/roles/aodh/tasks/bootstrap.yml b/ansible/roles/aodh/tasks/bootstrap.yml index 7c34e9397b..c743a3a459 100644 --- a/ansible/roles/aodh/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/barbican/tasks/bootstrap.yml b/ansible/roles/barbican/tasks/bootstrap.yml index a2775dcfda..b9ffb8f1d8 100644 --- a/ansible/roles/barbican/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/ceilometer/tasks/bootstrap.yml b/ansible/roles/ceilometer/tasks/bootstrap.yml index 716b31819b..36dcfa60e7 100644 --- a/ansible/roles/ceilometer/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 5a38351fc4..7a453a76cc 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml index 47f85002eb..32e3605a98 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/congress/tasks/bootstrap.yml b/ansible/roles/congress/tasks/bootstrap.yml index 86b49fd8e2..054b688f4e 100644 --- a/ansible/roles/congress/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/designate/tasks/bootstrap.yml b/ansible/roles/designate/tasks/bootstrap.yml index 30d52840fe..cd3934e86a 100644 --- a/ansible/roles/designate/tasks/bootstrap.yml +++ b/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 diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index cafdfd4cf8..73dc2fe62a 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/gnocchi/tasks/bootstrap.yml b/ansible/roles/gnocchi/tasks/bootstrap.yml index 671dfac5ed..8dcf250225 100644 --- a/ansible/roles/gnocchi/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/grafana/tasks/bootstrap.yml b/ansible/roles/grafana/tasks/bootstrap.yml index 85409917a1..2f744080ef 100644 --- a/ansible/roles/grafana/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index 2895989b26..1f2daba39d 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/horizon/tasks/bootstrap.yml b/ansible/roles/horizon/tasks/bootstrap.yml index ae92474574..05142ae646 100644 --- a/ansible/roles/horizon/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 3a456b0c0b..90e149feb0 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/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] }}" diff --git a/ansible/roles/karbor/tasks/bootstrap.yml b/ansible/roles/karbor/tasks/bootstrap.yml index 7742655b3d..9eab028069 100644 --- a/ansible/roles/karbor/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 1ac7b6aeca..7401563e27 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index 87f5268200..aeefb0b9c8 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml index 58051d1c66..38bc70d12f 100644 --- a/ansible/roles/manila/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml index 0623cad26a..ddd5c83bba 100644 --- a/ansible/roles/mistral/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index 800233c8a4..8c6e833422 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index 13d70b627c..fde1004a36 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index 504aebc677..0706e3a852 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/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] }}" diff --git a/ansible/roles/octavia/tasks/bootstrap.yml b/ansible/roles/octavia/tasks/bootstrap.yml index 787c647bee..23c609c2f3 100644 --- a/ansible/roles/octavia/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/panko/tasks/bootstrap.yml b/ansible/roles/panko/tasks/bootstrap.yml index d0b0ad1b4b..8b920ba64c 100644 --- a/ansible/roles/panko/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/rally/tasks/bootstrap.yml b/ansible/roles/rally/tasks/bootstrap.yml index 37e5bfa5d9..691f75ec7d 100644 --- a/ansible/roles/rally/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/sahara/tasks/bootstrap.yml b/ansible/roles/sahara/tasks/bootstrap.yml index 8a668fc83f..09206f435a 100644 --- a/ansible/roles/sahara/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/senlin/tasks/bootstrap.yml b/ansible/roles/senlin/tasks/bootstrap.yml index 6599961ac7..f9a44bda7e 100644 --- a/ansible/roles/senlin/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/solum/tasks/bootstrap.yml b/ansible/roles/solum/tasks/bootstrap.yml index cf3063abc5..2df4f7c73e 100644 --- a/ansible/roles/solum/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/tacker/tasks/bootstrap.yml b/ansible/roles/tacker/tasks/bootstrap.yml index 7a8f4aa868..96ce9a402d 100644 --- a/ansible/roles/tacker/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/trove/tasks/bootstrap.yml b/ansible/roles/trove/tasks/bootstrap.yml index 6764c6ea41..9e79da98a8 100644 --- a/ansible/roles/trove/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/watcher/tasks/bootstrap.yml b/ansible/roles/watcher/tasks/bootstrap.yml index 3c68da558e..3060cbe40d 100644 --- a/ansible/roles/watcher/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/zun/tasks/bootstrap.yml b/ansible/roles/zun/tasks/bootstrap.yml index 24b6b09851..98d0799b38 100644 --- a/ansible/roles/zun/tasks/bootstrap.yml +++ b/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"