From 0028b3cd1ec3bff8409da1fc3654d8dd677d67cf Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 1 Jun 2018 14:44:03 +0100 Subject: [PATCH] Move database creation into role (cinder) 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. Change-Id: I11e0e9538d1fcebba55732cd20fcbf8aaf7516d1 Depends-On: https://review.openstack.org/571724 --- test-install-cinder.yml | 4 ---- test-vars.yml | 3 --- 2 files changed, 7 deletions(-) diff --git a/test-install-cinder.yml b/test-install-cinder.yml index af6cc421..e8f5fb98 100644 --- a/test-install-cinder.yml +++ b/test-install-cinder.yml @@ -41,10 +41,6 @@ - "'oslomsg_rpc_all' in groups" - "groups['oslomsg_rpc_all'] | length > 0" - - include: create-grant-db.yml - db_name: "{{ cinder_galera_database }}" - db_password: "{{ cinder_container_mysql_password }}" - roles: - role: "os_cinder" vars_files: diff --git a/test-vars.yml b/test-vars.yml index 16558e3f..1f8b8232 100644 --- a/test-vars.yml +++ b/test-vars.yml @@ -317,7 +317,6 @@ cinder_backends_rbd_inuse: false cinder_ceph_client: cinder cinder_container_mysql_password: "SuperSecrete" cinder_developer_mode: true -cinder_galera_address: "{{ test_galera_host }}" cinder_git_install_branch: "{{ test_branch }}" cinder_glance_api_servers: "{{ glance_api_servers }}" cinder_profiler_hmac_key: "secrete" @@ -341,8 +340,6 @@ cinder_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" cinder_rabbitmq_password: "{{ rabbitmq_password }}" cinder_rabbitmq_userid: cinder cinder_rabbitmq_vhost: /cinder -cinder_galera_user: cinder -cinder_galera_database: cinder cinder_service_password: "secrete" cinder_venv_tag: "testing" cinder_service_port: 8776