Skip to content

Commit

Permalink
Fix for rh-mysql80
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Carabas committed Aug 17, 2020
1 parent 937d044 commit c267951
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
22 changes: 22 additions & 0 deletions examples/rh-mysql80-server.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
file {'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo':
source => 'https://raw.githubusercontent.com/sclorg/centos-release-scl/master/centos-release-scl/RPM-GPG-KEY-CentOS-SIG-SCLo'
}

yumrepo { 'centos-sclo-rh':
ensure => present,
name => 'CentOS-SCLo-scl-rh',
enabled => true,
baseurl => 'http://mirror.centos.org/centos/7/sclo/$basearch/rh/',
mirrorlist => 'http://mirrorlist.centos.org?arch=$basearch&release=7&repo=sclo-rh',
descr => 'CentOS-7 - SCLo rh',
gpgcheck => true,
gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo',
}
class {'mysql::server':
package_name => 'rh-mysql80',
package_ensure => 'installed',
service_name => 'rh-mysql80-mysqld',
config_file => '/etc/my.cnf',
includedir => '/etc/my.cnf.d',
options => { mysqld => { log_error => '/var/log/mysqld.log', datadir => '/var/lib/mysql' } }
}
2 changes: 2 additions & 0 deletions lib/puppet/provider/mysql.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class Puppet::Provider::Mysql < Puppet::Provider
'/opt/rh/rh-mysql56/root/usr/lib64',
'/opt/rh/rh-mysql57/root/usr/lib',
'/opt/rh/rh-mysql57/root/usr/lib64',
'/opt/rh/rh-mysql80/root/usr/lib',
'/opt/rh/rh-mysql80/root/usr/lib64',
'/opt/rh/rh-mariadb100/root/usr/lib',
'/opt/rh/rh-mariadb100/root/usr/lib64',
'/opt/rh/rh-mariadb101/root/usr/lib',
Expand Down
2 changes: 2 additions & 0 deletions lib/puppet/provider/mysql_datadir/mysql.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
ENV['PATH'],
'/usr/libexec',
'/usr/share/mysql/scripts',
'/opt/rh/rh-mysql80/root/usr/bin',
'/opt/rh/rh-mysql80/root/usr/libexec',
'/opt/rh/rh-mysql57/root/usr/bin',
'/opt/rh/rh-mysql57/root/usr/libexec',
'/opt/rh/rh-mysql56/root/usr/bin',
Expand Down

0 comments on commit c267951

Please sign in to comment.