|
| 1 | +From 5ebab2c43abd4204832bd6e7194f20f12dfed279 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Javier Pena < [email protected]> |
| 3 | +Date: Tue, 19 Feb 2019 19:18:10 +0100 |
| 4 | +Subject: [PATCH] Set proper python_package_name for RHEL/CentOS 8 |
| 5 | + |
| 6 | +mysql::bindings::python installs the package set by the |
| 7 | +python_package_name variable, which is 'MySQL-python' by default |
| 8 | +on all RHEL and Fedora-based systems. This is no longer valid for |
| 9 | +RHEL 8, since there is no Python3 support for the package. |
| 10 | + |
| 11 | +In RHEL 8, we should use python-PyMySQL instead. |
| 12 | +--- |
| 13 | + manifests/params.pp | 7 ++++++- |
| 14 | + 1 file changed, 6 insertions(+), 1 deletion(-) |
| 15 | + |
| 16 | +diff --git a/manifests/params.pp b/manifests/params.pp |
| 17 | +index b8def7d..ed6ff2c 100644 |
| 18 | +--- a/manifests/params.pp |
| 19 | ++++ b/manifests/params.pp |
| 20 | +@@ -49,6 +49,7 @@ class mysql::params { |
| 21 | + } else { |
| 22 | + $provider = 'mysql' |
| 23 | + } |
| 24 | ++ $python_package_name = 'MySQL-python' |
| 25 | + } |
| 26 | + /^(RedHat|CentOS|Scientific|OracleLinux)$/: { |
| 27 | + if versioncmp($::operatingsystemmajrelease, '7') >= 0 { |
| 28 | +@@ -56,6 +57,11 @@ class mysql::params { |
| 29 | + } else { |
| 30 | + $provider = 'mysql' |
| 31 | + } |
| 32 | ++ if versioncmp($::operatingsystemmajrelease, '8') >= 0 { |
| 33 | ++ $python_package_name = 'python3-PyMySQL' |
| 34 | ++ } else { |
| 35 | ++ $python_package_name = 'MySQL-python' |
| 36 | ++ } |
| 37 | + } |
| 38 | + default: { |
| 39 | + $provider = 'mysql' |
| 40 | +@@ -96,7 +102,6 @@ class mysql::params { |
| 41 | + $java_package_name = 'mysql-connector-java' |
| 42 | + $perl_package_name = 'perl-DBD-MySQL' |
| 43 | + $php_package_name = 'php-mysql' |
| 44 | +- $python_package_name = 'MySQL-python' |
| 45 | + $ruby_package_name = 'ruby-mysql' |
| 46 | + $client_dev_package_name = undef |
| 47 | + } |
| 48 | +-- |
| 49 | +2.20.1 |
| 50 | + |
0 commit comments