Merge "Use the utility host for db setup tasks"

defaults/main.yml

@@ -82,12 +82,14 @@ magnum_git_constraints:
   - "--constraint {{ magnum_upper_constraints_url }}"
 
 # Database vars
-magnum_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
+magnum_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
+magnum_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((magnum_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
 magnum_galera_address: "{{ galera_address | default('127.0.0.1') }}"
 magnum_galera_database_name: magnum_service
 magnum_galera_user: magnum
 magnum_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
 magnum_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
+magnum_galera_port: 3306
 
 # Oslo Messaging vars
 # RPC

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

tasks/main.yml

@@ -29,6 +29,9 @@
     - "inventory_hostname == ((groups[magnum_services['magnum-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
   vars:
     _oslodb_setup_host: "{{ magnum_db_setup_host }}"
+    _oslodb_ansible_python_interpreter: "{{ magnum_db_setup_python_interpreter }}"
+    _oslodb_setup_endpoint: "{{ magnum_galera_address }}"
+    _oslodb_setup_port: "{{ magnum_galera_port }}"
     _oslodb_databases:
       - name: "{{ magnum_galera_database_name }}"
         users: