Skip to content

Commit 0f0aa26

Browse files
author
Daniel Carabas
committed
Fix for rh-mysql80
1 parent 937d044 commit 0f0aa26

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

examples/rh-mysql80-server.pp

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
file {'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo':
2+
source => 'https://raw.githubusercontent.com/sclorg/centos-release-scl/master/centos-release-scl/RPM-GPG-KEY-CentOS-SIG-SCLo'
3+
}
4+
5+
yumrepo { 'centos-sclo-rh':
6+
ensure => present,
7+
name => 'CentOS-SCLo-scl-rh',
8+
enabled => true,
9+
baseurl => 'http://mirror.centos.org/centos/7/sclo/$basearch/rh/',
10+
mirrorlist => 'http://mirrorlist.centos.org?arch=$basearch&release=7&repo=sclo-rh',
11+
descr => 'CentOS-7 - SCLo rh',
12+
gpgcheck => true,
13+
gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo',
14+
}
15+
class {'mysql::server':
16+
package_name => 'rh-mysql80',
17+
package_ensure => 'installed',
18+
service_name => 'rh-mysql80-mysqld',
19+
config_file => '/etc/my.cnf',
20+
includedir => '/etc/my.cnf.d',
21+
options => { mysqld => { log_error => '/var/log/mysqld.log', datadir => '/var/lib/mysql' } }
22+
}

lib/puppet/provider/mysql.rb

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ class Puppet::Provider::Mysql < Puppet::Provider
1313
'/opt/rh/rh-mysql56/root/usr/lib64',
1414
'/opt/rh/rh-mysql57/root/usr/lib',
1515
'/opt/rh/rh-mysql57/root/usr/lib64',
16+
'/opt/rh/rh-mysql80/root/usr/lib',
17+
'/opt/rh/rh-mysql80/root/usr/lib64',
1618
'/opt/rh/rh-mariadb100/root/usr/lib',
1719
'/opt/rh/rh-mariadb100/root/usr/lib64',
1820
'/opt/rh/rh-mariadb101/root/usr/lib',
@@ -31,6 +33,8 @@ class Puppet::Provider::Mysql < Puppet::Provider
3133
'/usr/mysql/5.6/lib64',
3234
'/usr/mysql/5.7/lib',
3335
'/usr/mysql/5.7/lib64',
36+
'/usr/mysql/8.0/lib',
37+
'/usr/mysql/8.0/lib64',
3438
].join(':')
3539

3640
# rubocop:disable Style/HashSyntax

lib/puppet/provider/mysql_datadir/mysql.rb

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
ENV['PATH'],
1010
'/usr/libexec',
1111
'/usr/share/mysql/scripts',
12+
'/opt/rh/rh-mysql80/root/usr/bin',
13+
'/opt/rh/rh-mysql80/root/usr/libexec',
1214
'/opt/rh/rh-mysql57/root/usr/bin',
1315
'/opt/rh/rh-mysql57/root/usr/libexec',
1416
'/opt/rh/rh-mysql56/root/usr/bin',
@@ -28,6 +30,7 @@
2830
'/usr/mysql/5.5/bin',
2931
'/usr/mysql/5.6/bin',
3032
'/usr/mysql/5.7/bin',
33+
'/usr/mysql/8.0/bin',
3134
].join(':')
3235

3336
commands mysqld: 'mysqld'

0 commit comments

Comments
 (0)