Move database creation into role (rally)

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 group_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/578852
Change-Id: Ieec80ccbec9869fc69c81a2aac677d42b77fe0f7
This commit is contained in:
Jesse Pretorius 2018-06-28 16:41:41 +01:00
parent 2e607585eb
commit 6352555a62
2 changed files with 3 additions and 12 deletions

View File

@ -70,6 +70,3 @@ tempest_main_group: utility_all
rally_venv_tag: "{{ venv_tag }}"
rally_venv_download_url: "{{ venv_base_download_url }}/rally-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
rally_galera_user: rally
rally_galera_database_name: rally
rally_galera_address: "{{ galera_address }}"

View File

@ -17,19 +17,13 @@
hosts: utility_all
gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- rally
pre_tasks:
- include: common-tasks/unbound-clients.yml
static: no
when:
- hostvars['localhost']['resolvconf_enabled'] | bool
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ rally_galera_user }}"
password: "{{ rally_galera_password }}"
login_host: "{{ rally_galera_address }}"
db_name: "{{ rally_galera_database_name }}"
when: inventory_hostname == groups['utility_all'][0]
roles:
- role: "os_rally"
environment: "{{ deployment_environment_variables | default({}) }}"