From 6ca3e6e5b44bd74a2516d2cd9345f51215b0d172 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Thu, 20 Aug 2020 19:09:03 +0300
Subject: [PATCH] Use the utility host for db setup tasks

Move it to the service setup host (defaults to utility[0]) instead
of the galera[0] host, and use galera_address (defaults to internal VIP)
as the endpoint instead of a local connection on the db host.

Change-Id: I8f44fe543e22aeedc7289c72d589242323f3fefd
---
 defaults/main.yml  | 4 +++-
 tasks/db_setup.yml | 6 ++++++
 tasks/main.yml     | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index b2800752..aa93f850 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -215,7 +215,8 @@ neutron_quota_firewall_rule: 100
 ### DB (Galera) integration
 ###
 
-neutron_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
+neutron_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
+neutron_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((neutron_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
 neutron_galera_address: "{{ galera_address | default('127.0.0.1') }}"
 neutron_galera_user: neutron
 neutron_galera_database: neutron
@@ -224,6 +225,7 @@ neutron_db_pool_size: 120
 neutron_db_pool_timeout: 30
 neutron_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
 neutron_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
+neutron_galera_port: 3306
 
 ###
 ### Oslo Messaging
diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml
index 7a0120d4..aca206e4 100644
--- a/tasks/db_setup.yml
+++ b/tasks/db_setup.yml
@@ -22,12 +22,16 @@
 
 - name: Setup Database Service (MariaDB)
   delegate_to: "{{ _oslodb_setup_host }}"
+  vars:
+    ansible_python_interpreter: "{{ _oslodb_ansible_python_interpreter }}"
   tags:
     - common-mariadb
   block:
     - name: Create database for service
       mysql_db:
         name: "{{ item.name }}"
+        login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
+        login_port: "{{ _oslodb_setup_port | default(omit) }}"
       loop: "{{ _oslodb_databases }}"
       no_log: true
 
@@ -38,5 +42,7 @@
         host: "{{ item.1.host | default('%') }}"
         priv: "{{ item.0.name }}.*:{{ item.1.priv | default('ALL') }}"
         append_privs: yes
+        login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
+        login_port: "{{ _oslodb_setup_port | default(omit) }}"
       loop: "{{ _oslodb_databases | subelements('users') }}"
       no_log: true
diff --git a/tasks/main.yml b/tasks/main.yml
index b45f027c..596ab330 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -38,6 +38,9 @@
     - "inventory_hostname == ((groups[neutron_services['neutron-server']['group']] | intersect(ansible_play_hosts)) | list)[0]"
   vars:
     _oslodb_setup_host: "{{ neutron_db_setup_host }}"
+    _oslodb_ansible_python_interpreter: "{{ neutron_db_setup_python_interpreter }}"
+    _oslodb_setup_endpoint: "{{ neutron_galera_address }}"
+    _oslodb_setup_port: "{{ neutron_galera_port }}"
     _oslodb_databases:
       - name: "{{ neutron_galera_database }}"
         users: