meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-mysql/0002-puppet-mysql-changes-for-poky-stx.patch

   1 diff -ru a/manifests/params.pp b/manifests/params.pp
   2 --- a/manifests/params.pp       2020-03-05 19:24:51.246516534 +0800
   3 +++ b/manifests/params.pp       2020-03-05 19:50:08.630557886 +0800
   4 @@ -167,7 +167,7 @@
   5      }
   6
   7      'Debian': {
   8 -      if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 {
   9 +      if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 or $::operatingsystem == 'poky-stx' {
  10          $provider = 'mariadb'
  11        } else {
  12          $provider = 'mysql'
  13 @@ -188,8 +188,13 @@
  14        }
  15
  16        $basedir                 = '/usr'
  17 -      $config_file             = '/etc/mysql/my.cnf'
  18 -      $includedir              = '/etc/mysql/conf.d'
  19 +      if $::operatingsystem == 'poky-stx' {
  20 +        $config_file             = '/etc/my.cnf.d/server.cnf'
  21 +        $includedir              = '/etc/my.cnf.d'
  22 +      } else {
  23 +        $config_file             = '/etc/mysql/my.cnf'
  24 +        $includedir              = '/etc/mysql/conf.d'
  25 +      }
  26        $datadir                 = '/var/lib/mysql'
  27        $log_error               = '/var/log/mysql/error.log'
  28        $pidfile                 = '/var/run/mysqld/mysqld.pid'