Skip to content

Commit 4a7e884

Browse files
mrpk1906markuman
andauthored
Update default proxysql version, drop support for xenial (EOL) and fix small bugs (#92)
* Dynamic user/password in .my.cnf * python3-mysqldb: Correct package name * add changelogs * Update changelogs/fragments/89-dynamic-user-password-in-client-my-cnf-and-correct-package-name.yml * Update default proxysql version, drop support for xenial and fix small bugs * (chore) Correct pull request ID in changelog * (chore) re-add changelog Co-authored-by: Markus Bergholz <[email protected]>
1 parent c527827 commit 4a7e884

File tree

10 files changed

+14
-46
lines changed

10 files changed

+14
-46
lines changed

.github/workflows/ansible-test-roles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
proxysql:
24-
- 2.0.12
24+
- 2.3.2
2525
ansible:
2626
- stable-2.9
2727
### it looks like there's errors for 2.10+ with ansible-lint (https://github.com/ansible/ansible-lint/pull/878)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
minor_changes:
2+
- role_proxysql - Update default proxysql version and fix small bugs (https://github.com/ansible-collections/community.proxysql/pull/92).

roles/proxysql/defaults/main.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
### proxysql install
33
proxysql_download_src: https://github.com/sysown/proxysql/releases/download
4-
proxysql_version: 2.0.10
4+
proxysql_version: 2.3.2
55
proxysql_mysql_client_version: 5.7
66
proxysql_mysql_use_custom_build: false
77
proxysql_force_restart: false
@@ -93,8 +93,6 @@ proxysql_mysql_default_charset: utf8
9393
proxysql_mysql_default_query_delay: 0
9494
proxysql_mysql_default_query_timeout: 36000000
9595
proxysql_mysql_default_schema: information_schema
96-
proxysql_mysql_default_sql_mode:
97-
proxysql_mysql_default_time_zone: SYSTEM
9896
proxysql_mysql_init_connect:
9997
proxysql_mysql_max_allowed_packet: 4194304
10098
proxysql_mysql_max_transaction_time: 14400000
@@ -118,7 +116,6 @@ proxysql_mysql_query_processor_regex: 1
118116
proxysql_mysql_autocommit_false_is_transaction: false
119117
proxysql_mysql_autocommit_false_not_reusable: false
120118
proxysql_mysql_enforce_autocommit_on_reads: false
121-
proxysql_mysql_forward_autocommit: false
122119

123120
# prepared statements
124121
proxysql_mysql_max_stmts_cache: 10000
@@ -160,7 +157,7 @@ proxysql_mysql_monitor_writer_is_also_reader: true
160157
proxysql_mysql_commands_stats: true
161158
proxysql_mysql_eventslog_filename:
162159
proxysql_mysql_eventslog_filesize: 104857600
163-
proxysql_mysql_hostgroup_manager_verbose: 0
160+
proxysql_mysql_hostgroup_manager_verbose: 1
164161
proxysql_mysql_long_query_time: 1000
165162
proxysql_mysql_query_digests: true
166163
proxysql_mysql_query_digests_lowercase: false

roles/proxysql/meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ galaxy_info:
1010
platforms:
1111
- name: Ubuntu
1212
versions:
13-
- xenial
1413
- bionic
14+
- focal
1515

1616
galaxy_tags:
1717
- proxysql

roles/proxysql/tasks/install.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,6 @@
55
changed_when: false
66
ignore_errors: "{{ ansible_check_mode }}"
77

8-
- name: proxysql | install | install (trusty specific)
9-
block:
10-
11-
- name: proxysql | install | install platform specific prereqs
12-
apt:
13-
name: "{{ lookup('vars', 'proxysql_' + ansible_lsb.codename + '_prereqs') }}"
14-
state: present
15-
environment:
16-
DEBIAN_FRONTEND: noninteractive
17-
18-
rescue:
19-
20-
- name: proxysql | install | handle the error if we failed in check mode, with python-apt uninstalled
21-
assert:
22-
that: ansible_failed_result.msg is match("python-apt must be installed to use check mode.*")
23-
fail_msg: "unknown error during package install"
24-
success_msg: "running in check mode without python-apt installed, ignoring error"
25-
26-
when: ansible_lsb.major_release|int == 14
27-
28-
298
- name: proxysql | install | install
309
block:
3110

roles/proxysql/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020
- import_tasks: config.yml
2121
tags:
2222
- config
23+
become: true
24+
become_user: root

roles/proxysql/tasks/setvars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
- { username: "{{ proxysql_admin_user }}", password: "{{ proxysql_admin_password }}" }
77
- { username: "{{ proxysql_admin_cluster_username }}", password: "{{ proxysql_admin_cluster_password }}" }
88
when: item.username and item.password
9+
no_log: true

roles/proxysql/vars/main.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
---
22
### percona repo
33
percona_mysql_repos:
4-
- deb http://repo.percona.com/apt {{ ansible_lsb.codename }} main
5-
- deb-src http://repo.percona.com/apt {{ ansible_lsb.codename }} main
6-
7-
### platform specific packages
8-
proxysql_trusty_prereqs:
9-
- libgnutls28-dev
4+
- deb https://repo.percona.com/apt {{ ansible_lsb.codename }} main
5+
- deb-src https://repo.percona.com/apt {{ ansible_lsb.codename }} main
106

117
proxysql_prereqs:
128
- dirmngr
13-
- python-setuptools
9+
- python3-setuptools
1410
- python3-pip
1511
- python3-virtualenv
1612

@@ -153,12 +149,6 @@ proxysql_mysql_variables:
153149
default_schema:
154150
variable: "default_schema"
155151
variable_value: "{{ proxysql_mysql_default_schema }}"
156-
default_sql_mode:
157-
variable: "default_sql_mode"
158-
variable_value: "{{ proxysql_mysql_default_sql_mode }}"
159-
default_time_zone:
160-
variable: "default_time_zone"
161-
variable_value: "{{ proxysql_mysql_default_time_zone }}"
162152
eventslog_filename:
163153
variable: "eventslog_filename"
164154
variable_value: "{{ proxysql_mysql_eventslog_filename }}"
@@ -168,9 +158,6 @@ proxysql_mysql_variables:
168158
enforce_autocommit_on_reads:
169159
variable: "enforce_autocommit_on_reads"
170160
variable_value: "{{ proxysql_mysql_enforce_autocommit_on_reads | to_json}}"
171-
forward_autocommit:
172-
variable: "forward_autocommit"
173-
variable_value: "{{ proxysql_mysql_forward_autocommit | to_json}}"
174161
free_connections_pct:
175162
variable: "free_connections_pct"
176163
variable_value: "{{ proxysql_mysql_free_connections_pct }}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
proxysql_download_src: https://github.com/sysown/proxysql/releases/download
3-
proxysql_version: 2.0.10
3+
proxysql_version: 2.3.2
44

55
proxysql_mysql_client_version: 5.7

tests/integration/targets/setup_proxysql/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ proxysql_percona_mysql_repos:
77

88
proxysql_percona_mysql_packages:
99
- percona-server-client-{{ proxysql_mysql_client_version }}
10-
# - python-mysqldb
10+
- python3-mysqldb
1111

1212
proxysql_python_packages:
1313
- pymysql

0 commit comments

Comments
 (0)