Skip to content

Commit 6de5cc8

Browse files
committed
Add patch to support RHEL 8 packaging
There is an open pull request to puppet-mysql [1] to add support for RHEL 8 packages, where MySQL-python is not available. While it is discussed, let's add it to RDO to allow progress. [1] - puppetlabs/puppetlabs-mysql#1161 Change-Id: I5d1c4fd7812b8a3222e8ab1a96c8f220f40fda33
1 parent 310b3c9 commit 6de5cc8

File tree

2 files changed

+53
-2
lines changed

2 files changed

+53
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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+

puppet-mysql.spec

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ License: ASL 2.0
1515
URL: http://github.com/puppetlabs/puppetlabs-mysql
1616

1717
Source0: https://github.com/puppetlabs/%{upstream_name}/archive/%{commit}.tar.gz#/%{upstream_name}-%{shortcommit}.tar.gz
18-
18+
# https://github.com/puppetlabs/puppetlabs-mysql/pull/1161
19+
Patch0001: 0001-Set-proper-python_package_name-for-RHEL-CentOS-8.patch
1920
BuildArch: noarch
2021

2122
Requires: puppet-stdlib
@@ -26,7 +27,7 @@ Requires: puppet >= 2.7.0
2627
Installs, configures, and manages the MySQL service.
2728

2829
%prep
29-
%setup -q -n %{upstream_name}-%{upstream_version}
30+
%autosetup -p1 -n %{upstream_name}-%{upstream_version}
3031

3132
find . -type f -name ".*" -exec rm {} +
3233
find . -size 0 -exec rm {} +

0 commit comments

Comments
 (0)