diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-14 15:26:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-14 15:26:21 +0000 |
| commit | f3767135c6cc072058ac482bfdce10e20033bc92 (patch) | |
| tree | 8e6d79ea9bba5b79615ee539adc1f1bb785d6f90 | |
| parent | b53988a08875309d531d1e17128e7a37fca3049a (diff) | |
| parent | 033a444fefc1e7131559a444d43131b004de66d3 (diff) | |
| download | kolla-f3767135c6cc072058ac482bfdce10e20033bc92.tar.gz kolla-f3767135c6cc072058ac482bfdce10e20033bc92.zip | |
Merge "Fix ceilometer idempotent"
| -rw-r--r-- | ansible/roles/ceilometer/tasks/bootstrap.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ansible/roles/ceilometer/tasks/bootstrap.yml b/ansible/roles/ceilometer/tasks/bootstrap.yml index a70e46004..a3c39eaa7 100644 --- a/ansible/roles/ceilometer/tasks/bootstrap.yml +++ b/ansible/roles/ceilometer/tasks/bootstrap.yml @@ -1,7 +1,7 @@ --- - 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" ]})' - register: database + register: mongodb_ceilometer_database run_once: true failed_when: - "'already' not in database.stdout" @@ -18,7 +18,7 @@ login_user='{{ database_user }}' login_password='{{ database_password }}' name='{{ ceilometer_database_name }}'" - register: database + register: mysql_ceilometer_database changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" failed_when: database.stdout.split()[2] != 'SUCCESS' @@ -48,4 +48,8 @@ when: - ceilometer_database_type == "mysql" +# TODO(Jeffrey4l): fix idempotent when ceilomter_database_type == "gnocchi" - 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") |