openstack/kolla-ansible
Code Issues Proposed changes

Fix ceilometer idempotent

Browse Source 
bootstrap_service in ceilometer should only be ran once during multi
deployment to keep idempotent

Partial-Bug: #1633463
Change-Id: Ic5d256e2e887661b4679c4518e8c3865b85189bf
This commit is contained in:
Jeffrey Zhang 2016-10-14 10:47:00 +08:00
parent 4bda9aa844
commit 033a444fef
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
--- ---
- name: Creating Ceilometer MongoDB database - name: Creating Ceilometer MongoDB database
command: docker exec -t mongodb mongo --host {{ ceilometer_database_mongodb_address }} --eval 'db = db.getSiblingDB("{{ ceilometer_database_name }}"); db.addUser({user':' "{{ ceilometer_database_user }}", pwd':' "{{ ceilometer_database_password}}", roles':' [ "readWrite", "dbAdmin" ]})' command: docker exec -t mongodb mongo --host {{ ceilometer_database_mongodb_address }} --eval 'db = db.getSiblingDB("{{ ceilometer_database_name }}"); db.addUser({user':' "{{ ceilometer_database_user }}", pwd':' "{{ ceilometer_database_password}}", roles':' [ "readWrite", "dbAdmin" ]})'
register: database register: mongodb_ceilometer_database
run_once: true run_once: true
failed_when: failed_when:
- "'already' not in database.stdout" - "'already' not in database.stdout"
@ -18,7 +18,7 @@
login_user='{{ database_user }}' login_user='{{ database_user }}'
login_password='{{ database_password }}' login_password='{{ database_password }}'
name='{{ ceilometer_database_name }}'" name='{{ ceilometer_database_name }}'"
register: database register: mysql_ceilometer_database
changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and
(database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
failed_when: database.stdout.split()[2] != 'SUCCESS' failed_when: database.stdout.split()[2] != 'SUCCESS'
@ -48,4 +48,8 @@
when: when:
- ceilometer_database_type == "mysql" - ceilometer_database_type == "mysql"
# TODO(Jeffrey4l): fix idempotent when ceilomter_database_type == "gnocchi"
- include: bootstrap_service.yml - include: bootstrap_service.yml
when: ((ceilometer_database_type == "mongodb" and mongodb_ceilometer_database.changed)
or (ceilometer_database_type == "mysql" and mysql_ceilometer_database.changed)
or ceilometer_database_type == "gnocchi")