diff --git a/defaults/main.yml b/defaults/main.yml index e1fc51b..01de8e1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -87,12 +87,14 @@ sahara_oslomsg_notify_vhost: "{{ sahara_oslomsg_rpc_vhost }}" sahara_oslomsg_amqp1_enabled: "{{ sahara_oslomsg_rpc_transport == 'amqp' }}" ## Database info -sahara_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}" +sahara_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" +sahara_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((sahara_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" sahara_galera_address: "{{ galera_address | default('127.0.0.1') }}" sahara_galera_database: sahara sahara_galera_user: sahara sahara_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" sahara_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" +sahara_galera_port: 3306 sahara_role_name: admin sahara_api_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml index 7a0120d..aca206e 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 006d0a9..e6706c2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,6 +29,9 @@ - "inventory_hostname == ((groups[sahara_services['sahara-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" vars: _oslodb_setup_host: "{{ sahara_db_setup_host }}" + _oslodb_ansible_python_interpreter: "{{ sahara_db_setup_python_interpreter }}" + _oslodb_setup_endpoint: "{{ sahara_galera_address }}" + _oslodb_setup_port: "{{ sahara_galera_port }}" _oslodb_databases: - name: "{{ sahara_galera_database }}" users: