openstack/kolla-ansible
Code Issues Proposed changes

Fix Ceilometer cannot create MySQL database

Browse Source 
Due to kolla-toolbox return json object instead of just
plain string, we can use the object directly.

Change-Id: I55613f0f8ba97d1a14595c8c9b09e1ad6d2366e7
Closes-Bug: #1668521
This commit is contained in:
Duong Ha-Quang 2017-03-01 09:14:34 +07:00
parent 889fc2d849
commit a2a9c17d51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/ceilometer/tasks/bootstrap.yml
View File

@ -9,7 +9,7 @@
when: when:
- ceilometer_database_type == "mongodb" - ceilometer_database_type == "mongodb"
- name: Checking Ceilometer mysql database - name: Creating external Ceilometer MySQL database by using given credential
kolla_toolbox: kolla_toolbox:
module_name: mysql_db module_name: mysql_db
module_args: module_args:
@ -25,7 +25,7 @@
when: when:
- ceilometer_database_type == "mysql" - ceilometer_database_type == "mysql"
- name: Creating Ceilometer mysql database - name: Fallback to create internal Ceilometer MySQL database
kolla_toolbox: kolla_toolbox:
module_name: mysql_db module_name: mysql_db
module_args: module_args:
@ -39,7 +39,7 @@
delegate_to: "{{ groups['ceilometer-api'][0] }}" delegate_to: "{{ groups['ceilometer-api'][0] }}"
when: when:
- ceilometer_database_type == "mysql" - ceilometer_database_type == "mysql"
- "'FAILED' in mysql_access.stdout" - mysql_access.failed
- name: Creating Ceilometer database user and setting permissions - name: Creating Ceilometer database user and setting permissions
kolla_toolbox: kolla_toolbox:
@ -58,7 +58,7 @@
delegate_to: "{{ groups['ceilometer-api'][0] }}" delegate_to: "{{ groups['ceilometer-api'][0] }}"
when: when:
- ceilometer_database_type == "mysql" - ceilometer_database_type == "mysql"
- "'FAILED' in mysql_access.stdout" - mysql_access.failed
# TODO(Jeffrey4l): fix idempotent when ceilometer_database_type == "gnocchi" # TODO(Jeffrey4l): fix idempotent when ceilometer_database_type == "gnocchi"
# NOTE(vbel): bootstrapping of mysql db for ceilometer is idempotent # NOTE(vbel): bootstrapping of mysql db for ceilometer is idempotent