Merge pull request #1241 from treydock/el8

michaeltlombardi · web-flow · commit 135f1c69c44a · 2019-10-09T09:39:53.000-05:00
Use mariadb-java-client for EL8 java package
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -58,8 +58,10 @@
             $provider = 'mysql'
           }
           if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
+            $java_package_name   = 'mariadb-java-client'
             $python_package_name = 'python3-PyMySQL'
           } else {
+            $java_package_name   = 'mysql-connector-java'
             $python_package_name = 'MySQL-python'
           }
         }
@@ -99,7 +101,6 @@
       $ssl_key                 = '/etc/mysql/server-key.pem'
       $tmpdir                  = '/tmp'
       # mysql::bindings
-      $java_package_name       = 'mysql-connector-java'
       $perl_package_name       = 'perl-DBD-MySQL'
       $php_package_name        = 'php-mysql'
       $ruby_package_name       = 'ruby-mysql'

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,10 @@`
`58`	`58`	`$provider = 'mysql'`
`59`	`59`	`}`
`60`	`60`	`if versioncmp($::operatingsystemmajrelease, '8') >= 0 {`
	`61`	`+ $java_package_name = 'mariadb-java-client'`
`61`	`62`	`$python_package_name = 'python3-PyMySQL'`
`62`	`63`	`} else {`
	`64`	`+ $java_package_name = 'mysql-connector-java'`
`63`	`65`	`$python_package_name = 'MySQL-python'`
`64`	`66`	`}`
`65`	`67`	`}`
`@@ -99,7 +101,6 @@`
`99`	`101`	`$ssl_key = '/etc/mysql/server-key.pem'`
`100`	`102`	`$tmpdir = '/tmp'`
`101`	`103`	`# mysql::bindings`
`102`		`- $java_package_name = 'mysql-connector-java'`
`103`	`104`	`$perl_package_name = 'perl-DBD-MySQL'`
`104`	`105`	`$php_package_name = 'php-mysql'`
`105`	`106`	`$ruby_package_name = 'ruby-mysql'`