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%2F0003-puppet-dcmanager-updates-for-poky-stx.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2F0003-puppet-dcmanager-updates-for-poky-stx.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=c396c83e49b03aca38a054ea29748db633f7ca02;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0003-puppet-dcmanager-updates-for-poky-stx.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0003-puppet-dcmanager-updates-for-poky-stx.patch
deleted file mode 100644
index c396c83..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/0003-puppet-dcmanager-updates-for-poky-stx.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp b/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp
-index 5cbfb50..0a4d91b 100644
---- a/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp
-+++ b/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp
-@@ -13,13 +13,28 @@ class dcmanager::params {
-   $dcmanager_conf = '/etc/dcmanager/dcmanager.conf'
- 
-   if $::osfamily == 'Debian' {
--    $package_name       = 'distributedcloud-dcmanager'
--    $client_package     = 'distributedcloud-client-dcmanagerclient'
--    $api_package        = 'distributedcloud-dcmanager'
--    $api_service        = 'dcmanager-api'
--    $manager_package     = 'distributedcloud-dcmanager'
--    $manager_service     = 'dcmanager-manager'
--    $db_sync_command    = 'dcmanager-manage db_sync'
-+
-+    if $::operatingsystem == 'poky-stx' {
-+
-+      $package_name       = 'distributedcloud-dcmanager'
-+      $client_package     = 'distributedcloud-client-dcmanager'
-+      $api_package        = false
-+      $api_service        = 'dcmanager-api'
-+      $manager_package     = false
-+      $manager_service     = 'dcmanager-manager'
-+      $db_sync_command    = 'dcmanager-manage db_sync'
-+
-+    } else {
-+
-+      $package_name       = 'distributedcloud-dcmanager'
-+      $client_package     = 'distributedcloud-client-dcmanagerclient'
-+      $api_package        = 'distributedcloud-dcmanager'
-+      $api_service        = 'dcmanager-api'
-+      $manager_package     = 'distributedcloud-dcmanager'
-+      $manager_service     = 'dcmanager-manager'
-+      $db_sync_command    = 'dcmanager-manage db_sync'
-+
-+    }
- 
-   } elsif($::osfamily == 'RedHat') {
-