X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-etcd%2Fpuppet-etcd-changes-for-poky-stx.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-etcd%2Fpuppet-etcd-changes-for-poky-stx.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=0c3d2fe4ee3942d98c4c5410b5293870208258b4;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-etcd/puppet-etcd-changes-for-poky-stx.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-etcd/puppet-etcd-changes-for-poky-stx.patch
deleted file mode 100644
index 0c3d2fe..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-etcd/puppet-etcd-changes-for-poky-stx.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru a/manifests/config.pp b/manifests/config.pp
---- a/manifests/config.pp	2020-03-05 15:24:05.754122863 +0800
-+++ b/manifests/config.pp	2020-03-05 16:45:19.090255672 +0800
-@@ -14,6 +14,7 @@
-     content => template("${module_name}/etc/etcd/etcd.yml.erb"),
-   }
- 
-+  # only available for Redhat??
-   if $::etcd::manage_package and $::etcd::journald_forward_enable and $::operatingsystemmajrelease == '7' {
-     file { '/etc/systemd/system/etcd.service.d':
-       ensure => 'directory',
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp	2020-03-05 15:24:05.754122863 +0800
-+++ b/manifests/params.pp	2020-03-05 16:15:42.434207254 +0800
-@@ -17,7 +17,11 @@
-       }
-     }
-     'Debian' : {
--      $config_file_path = '/etc/default/etcd.conf'
-+      if ($::operatingsystem == 'poky-stx') {
-+        $config_file_path = '/etc/etcd/etcd.conf'
-+      } else {
-+        $config_file_path = '/etc/default/etcd.conf'
-+      }
-     }
-     default  : {
-       fail('Unsupported OS.')