diff --git a/defaults/main.yml b/defaults/main.yml index 2884eed..3c253ae 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,8 +35,10 @@ rally_venv_tag: "{{ venv_tag | default('untagged') }}" rally_bin: "/openstack/venvs/rally-{{ rally_venv_tag }}/bin" # Database vars -rally_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}" +rally_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" +rally_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((rally_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" rally_galera_address: "{{ galera_address | default('127.0.0.1') }}" +rally_galera_port: 3306 rally_galera_database: rally rally_galera_user: rally rally_database_connection_string: mysql+pymysql://{{ rally_galera_user }}:{{ rally_galera_password }}@{{ rally_galera_address }}/{{ rally_galera_database }}?charset=utf8 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 c7e32b4..65834ae 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,6 +29,9 @@ when: inventory_hostname == groups['utility_all'][0] vars: _oslodb_setup_host: "{{ rally_db_setup_host }}" + _oslodb_ansible_python_interpreter: "{{ rally_db_setup_python_interpreter }}" + _oslodb_setup_endpoint: "{{ rally_galera_address }}" + _oslodb_setup_port: "{{ rally_galera_port }}" _oslodb_databases: - name: "{{ rally_galera_database }}" users: