meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-etcd/puppet-etcd-changes-for-poky-stx.patch

   1 diff -ru a/manifests/config.pp b/manifests/config.pp
   2 --- a/manifests/config.pp       2020-03-05 15:24:05.754122863 +0800
   3 +++ b/manifests/config.pp       2020-03-05 16:45:19.090255672 +0800
   4 @@ -14,6 +14,7 @@
   5      content => template("${module_name}/etc/etcd/etcd.yml.erb"),
   6    }
   7
   8 +  # only available for Redhat??
   9    if $::etcd::manage_package and $::etcd::journald_forward_enable and $::operatingsystemmajrelease == '7' {
  10      file { '/etc/systemd/system/etcd.service.d':
  11        ensure => 'directory',
  12 diff -ru a/manifests/params.pp b/manifests/params.pp
  13 --- a/manifests/params.pp       2020-03-05 15:24:05.754122863 +0800
  14 +++ b/manifests/params.pp       2020-03-05 16:15:42.434207254 +0800
  15 @@ -17,7 +17,11 @@
  16        }
  17      }
  18      'Debian' : {
  19 -      $config_file_path = '/etc/default/etcd.conf'
  20 +      if ($::operatingsystem == 'poky-stx') {
  21 +        $config_file_path = '/etc/etcd/etcd.conf'
  22 +      } else {
  23 +        $config_file_path = '/etc/default/etcd.conf'
  24 +      }
  25      }
  26      default  : {
  27        fail('Unsupported OS.')