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

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0004-puppet-dcorch-updates-for-poky-stx.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0004-puppet-dcorch-updates-for-poky-stx.patch
deleted file mode 100644
index 2a87b36..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0004-puppet-dcorch-updates-for-poky-stx.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/modules/puppet-dcorch/src/dcorch/manifests/params.pp b/modules/puppet-dcorch/src/dcorch/manifests/params.pp
-index 76d5fa1..334cfeb 100644
---- a/modules/puppet-dcorch/src/dcorch/manifests/params.pp
-+++ b/modules/puppet-dcorch/src/dcorch/manifests/params.pp
-@@ -14,18 +14,37 @@ class dcorch::params {
-   $dcorch_paste_api_ini = '/etc/dcorch/api-paste.ini'
- 
-   if $::osfamily == 'Debian' {
--    $package_name          = 'distributedcloud-dcorch'
--    $client_package        = 'distributedcloud-client-dcorchclient'
--    $api_package           = 'distributedcloud-dcorch'
--    $api_service           = 'dcorch-api'
--    $engine_package        = 'distributedcloud-dcorch'
--    $engine_service        = 'dcorch-engine'
--    $snmp_package          = 'distributedcloud-dcorch'
--    $snmp_service          = 'dcorch-snmp'
--    $api_proxy_package      = 'distributedcloud-dcorch'
--    $api_proxy_service      = 'dcorch-api-proxy'
- 
--    $db_sync_command       = 'dcorch-manage db_sync'
-+    if $::operatingsystem == 'poky-stx' {
-+
-+      $package_name          = 'dcorch'
-+      $client_package        = 'distributedcloud-client-dcorchclient'
-+      $api_package           = false
-+      $api_service           = 'dcorch-api'
-+      $snmp_package          = false
-+      $snmp_service          = 'dcorch-snmp'
-+      $engine_package        = false
-+      $engine_service        = 'dcorch-engine'
-+      $api_proxy_package      = false
-+      $api_proxy_service      = 'dcorch-api-proxy'
-+      $db_sync_command       = 'dcorch-manage db_sync'
-+
-+    } else {
-+
-+      $package_name          = 'distributedcloud-dcorch'
-+      $client_package        = 'distributedcloud-client-dcorchclient'
-+      $api_package           = 'distributedcloud-dcorch'
-+      $api_service           = 'dcorch-api'
-+      $engine_package        = 'distributedcloud-dcorch'
-+      $engine_service        = 'dcorch-engine'
-+      $snmp_package          = 'distributedcloud-dcorch'
-+      $snmp_service          = 'dcorch-snmp'
-+      $api_proxy_package      = 'distributedcloud-dcorch'
-+      $api_proxy_service      = 'dcorch-api-proxy'
-+
-+      $db_sync_command       = 'dcorch-manage db_sync'
-+
-+    }
- 
-   } elsif($::osfamily == 'RedHat') {
-