Merge pull request #1161 from javierpena/master

eimlav · web-flow · commit 9075bc30834f · 2019-03-26T13:18:23.000Z
[MODULES-8779] Set proper python_package_name for RHEL/CentOS 8
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -49,13 +49,19 @@
           } else {
             $provider = 'mysql'
           }
+          $python_package_name = 'MySQL-python'
         }
         /^(RedHat|CentOS|Scientific|OracleLinux)$/: {
           if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
             $provider = 'mariadb'
           } else {
             $provider = 'mysql'
           }
+          if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
+            $python_package_name = 'python3-PyMySQL'
+          } else {
+            $python_package_name = 'MySQL-python'
+          }
         }
         default: {
           $provider = 'mysql'
@@ -96,7 +102,6 @@
       $java_package_name       = 'mysql-connector-java'
       $perl_package_name       = 'perl-DBD-MySQL'
       $php_package_name        = 'php-mysql'
-      $python_package_name     = 'MySQL-python'
       $ruby_package_name       = 'ruby-mysql'
       $client_dev_package_name = undef
     }

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,19 @@`
`49`	`49`	`} else {`
`50`	`50`	`$provider = 'mysql'`
`51`	`51`	`}`
	`52`	`+ $python_package_name = 'MySQL-python'`
`52`	`53`	`}`
`53`	`54`	`/^(RedHat\|CentOS\|Scientific\|OracleLinux)$/: {`
`54`	`55`	`if versioncmp($::operatingsystemmajrelease, '7') >= 0 {`
`55`	`56`	`$provider = 'mariadb'`
`56`	`57`	`} else {`
`57`	`58`	`$provider = 'mysql'`
`58`	`59`	`}`
	`60`	`+ if versioncmp($::operatingsystemmajrelease, '8') >= 0 {`
	`61`	`+ $python_package_name = 'python3-PyMySQL'`
	`62`	`+ } else {`
	`63`	`+ $python_package_name = 'MySQL-python'`
	`64`	`+ }`
`59`	`65`	`}`
`60`	`66`	`default: {`
`61`	`67`	`$provider = 'mysql'`
`@@ -96,7 +102,6 @@`
`96`	`102`	`$java_package_name = 'mysql-connector-java'`
`97`	`103`	`$perl_package_name = 'perl-DBD-MySQL'`
`98`	`104`	`$php_package_name = 'php-mysql'`
`99`		`- $python_package_name = 'MySQL-python'`
`100`	`105`	`$ruby_package_name = 'ruby-mysql'`
`101`	`106`	`$client_dev_package_name = undef`
`102`	`107`	`}`