openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix mysql database user of ceilometer"

Browse Source
This commit is contained in:
Jenkins 2017-01-23 15:24:30 +00:00 committed by Gerrit Code Review
commit e2f91df367
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
module_args: module_args:
login_host: "{{ ceilometer_database_mysql_address }}" login_host: "{{ ceilometer_database_mysql_address }}"
login_port: "{{ ceilometer_database_port }}" login_port: "{{ ceilometer_database_port }}"
login_user: "{{ ceilomter_database_user }}" login_user: "{{ ceilometer_database_user }}"
login_password: "{{ ceilometer_database_password }}" login_password: "{{ ceilometer_database_password }}"
name: "{{ ceilometer_database_name }}" name: "{{ ceilometer_database_name }}"
register: mysql_access register: mysql_access
@ -61,7 +61,7 @@
- ceilometer_database_type == "mysql" - ceilometer_database_type == "mysql"
- "'FAILED' in mysql_access.stdout" - "'FAILED' in mysql_access.stdout"
# TODO(Jeffrey4l): fix idempotent when ceilomter_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
- include: bootstrap_service.yml - include: bootstrap_service.yml
when: ((ceilometer_database_type == "mongodb" and mongodb_ceilometer_database.changed) when: ((ceilometer_database_type == "mongodb" and mongodb_ceilometer_database.changed)