Skip to content

Commit 6f234d5

Browse files
committed
PR geerlingguy#367: Update CentOS / RHEL 8 support.
1 parent fc68912 commit 6f234d5

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ env:
66
global:
77
- ROLE_NAME: mysql
88
matrix:
9+
- MOLECULE_DISTRO: centos8
910
- MOLECULE_DISTRO: centos7
1011
- MOLECULE_DISTRO: centos6
1112
- MOLECULE_DISTRO: ubuntu1804

tasks/setup-RedHat.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,3 @@
55
state: present
66
enablerepo: "{{ mysql_enablerepo | default(omit, true) }}"
77
register: rh_mysql_install_packages
8-
9-
- name: Determine required MySQL Python libraries
10-
set_fact:
11-
rhel_mysql_python_package: "{% if ansible_distribution_major_version|int >= 8 %}['python3-PyMySQL','python2-PyMySQL']{% else %}MySQL-python{% endif %}"
12-
13-
- name: Ensure MySQL Python libraries are installed.
14-
yum:
15-
name: "{{ rhel_mysql_python_package }}"
16-
state: present
17-
enablerepo: "{{ mysql_enablerepo | default(omit, true) }}"

vars/RedHat-8.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@ __mysql_daemon: mariadb
33
__mysql_packages:
44
- mariadb
55
- mariadb-server
6-
# mariadb-libs not available, but mariadb-connector-c can be a replacement
7-
# See https://bugzilla.redhat.com/show_bug.cgi?id=1494910#c2
86
- mariadb-connector-c
9-
# MySQL-python replaced by the following packages,
10-
# See https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#package-replacements_changes-to-packages
11-
- python2-PyMySQL
127
- python3-PyMySQL
138
- perl-DBD-MySQL
149
__mysql_slow_query_log_file: /var/log/mysql-slow.log
@@ -18,6 +13,6 @@ __mysql_pid_file: /var/run/mariadb/mariadb.pid
1813
__mysql_config_file: /etc/my.cnf
1914
__mysql_config_include_dir: /etc/my.cnf.d
2015
__mysql_socket: /var/lib/mysql/mysql.sock
21-
# The entries controlled by this value should not be used MariaDB >= 10.2.2
16+
# The entries controlled by this value should not be used with MariaDB >= 10.2.2
2217
# See https://github.com/frappe/bench/issues/681#issuecomment-398984706
2318
__mysql_supports_innodb_large_prefix: false

0 commit comments

Comments
 (0)