Move database creation into role (gnocchi)

There is no record for why we implement the database creation outside
of the role in the playbook, when we could do it inside the role.

Implementing it inside the role allows us to reduce the quantity of
group_vars duplicated from the role, and allows us to better document
the required variables in the role. The delegation can still be done
as it is done in the playbook too.

In this patch we remove the test-vars which were duplicated from the
role, and remove the DB setup tasks as they are no longer required.

Depends-On: https://review.openstack.org/571735
Change-Id: I79463160cf862cdfe95a9ec0522f676ce67e4703
This commit is contained in:
Jesse Pretorius 2018-06-01 15:02:19 +01:00
parent 287c890584
commit 0a0267ff84
2 changed files with 1 additions and 7 deletions

View File

@ -19,11 +19,7 @@
become: true
gather_facts: true
any_errors_fatal: true
pre_tasks:
- include: create-grant-db.yml
db_name: "{{ gnocchi_database_name }}"
db_password: "{{ gnocchi_container_mysql_password }}"
roles:
- role: "{{ gnocchi_rolename | default('os_gnocchi') }}"
- role: "os_gnocchi"
vars_files:
- test-vars.yml

View File

@ -439,11 +439,9 @@ gnocchi_developer_mode: true
gnocchi_service_publicuri: "http://{{ test_gnocchi_api_host }}:8041"
gnocchi_service_adminuri: "http://{{ test_gnocchi_api_host }}:8041"
gnocchi_service_internaluri: "http://{{ test_gnocchi_api_host }}:8041"
gnocchi_database_name: "gnocchi"
gnocchi_container_mysql_password: "secrete"
gnocchi_keystone_auth: yes
gnocchi_service_password: "secrete"
gnocchi_galera_address: "{{ test_galera_host }}"
gnocchi_ssl_external: false
# Ironic specific settings