From b83eebd336bf46ea6b877ae058a6964891a4e2a9 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 1 Jun 2018 18:07:12 +0100 Subject: [PATCH] Move database creation into role (neutron) 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: I0c40e3b9493e8c5b2c1009a9aae8fe78e963c074 Depends-On: https://review.openstack.org/571781 --- test-install-neutron.yml | 4 ---- test-vars.yml | 2 -- 2 files changed, 6 deletions(-) diff --git a/test-install-neutron.yml b/test-install-neutron.yml index e6e71e84..047d4eaa 100644 --- a/test-install-neutron.yml +++ b/test-install-neutron.yml @@ -98,10 +98,6 @@ - "'oslomsg_rpc_all' in groups" - "groups['oslomsg_rpc_all'] | length > 0" - - include: create-grant-db.yml - db_name: "{{ neutron_galera_database }}" - db_password: "{{ neutron_container_mysql_password }}" - - name: Deploy neutron server diff --git a/test-vars.yml b/test-vars.yml index 16558e3f..7c665800 100644 --- a/test-vars.yml +++ b/test-vars.yml @@ -270,8 +270,6 @@ nova_cell0_database: "nova_cell0" # Neutron specific settings neutron_container_mysql_password: SuperSecrete neutron_developer_mode: true -neutron_galera_address: "{{ test_galera_host }}" -neutron_galera_database: neutron neutron_git_install_branch: "{{ test_branch }}" neutron_ha_vrrp_auth_password: secrete neutron_management_address: "{{ test_neutron_server_host }}"