From 371ec8d5d25132f8b687cc03a2dbf3d738a99b2a Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 1 Jun 2018 18:04:57 +0100 Subject: [PATCH] Move database creation into role 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 implement a new variable called 'neutron_db_setup_host' which is used in the role to allow delegation of the database setup task to any host, but defaults to the first member of the galera_all host group. We also document the variable neutron_galera_address which has been used for a long time, but never documented. Change-Id: I244a6515bae1b1d090d4a2475c055dd22aa8f860 --- defaults/main.yml | 2 ++ examples/playbook.yml | 4 ++++ tasks/neutron_db_setup.yml | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index de807937..aec6c62c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -183,6 +183,8 @@ neutron_quota_vip: 10 ### DB (Galera) integration ### +neutron_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}" +neutron_galera_address: "{{ galera_address | default('127.0.0.1') }}" neutron_galera_user: neutron neutron_galera_database: neutron neutron_db_max_overflow: 20 diff --git a/examples/playbook.yml b/examples/playbook.yml index 14ef7d08..e134552c 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -6,3 +6,7 @@ - { role: "os_neutron", tags: [ "neutron-install", "neutron-config" ] } vars: neutron_galera_address: "{{ internal_lb_vip_address }}" + galera_root_user: root + vars_prompt: + - name: "galera_root_password" + prompt: "What is galera_root_password?" diff --git a/tasks/neutron_db_setup.yml b/tasks/neutron_db_setup.yml index 433be98d..9c188eb1 100644 --- a/tasks/neutron_db_setup.yml +++ b/tasks/neutron_db_setup.yml @@ -13,6 +13,32 @@ # See the License for the specific language governing permissions and # limitations under the License. +- name: Create DB for service + mysql_db: + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" + login_host: "{{ neutron_galera_address }}" + name: "{{ neutron_galera_database }}" + state: "present" + delegate_to: "{{ neutron_db_setup_host }}" + no_log: True + +- name: Grant access to the DB for the service + mysql_user: + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" + login_host: "{{ neutron_galera_address }}" + name: "{{ neutron_galera_user }}" + password: "{{ neutron_container_mysql_password }}" + host: "{{ item }}" + state: "present" + priv: "{{ neutron_galera_database }}.*:ALL" + delegate_to: "{{ neutron_db_setup_host }}" + with_items: + - "localhost" + - "%" + no_log: True + - name: Perform a DB expand command: "{{ neutron_bin }}/neutron-db-manage upgrade --expand" become: yes