From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 28 Apr 2020 09:47:46 +0000 (+0800)
Subject: stx-config: cleanup useless patches
X-Git-Tag: bronze-rc0~59
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=c0a7f365667d690b3ea02fb226117c4e58dbb339;p=pti%2Frtp.git

stx-config: cleanup useless patches

These patches are useless after rebased to stx 3.0

Issue-ID: INF-51
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I243c6739d7dac250c04ce413ec7b2c6b026a59c6
---

diff --git a/meta-stx/recipes-core/stx-config/files/0001-puppet-manifests-adjust-path-variable.patch b/meta-stx/recipes-core/stx-config/files/0001-puppet-manifests-adjust-path-variable.patch
deleted file mode 100644
index aea9672..0000000
--- a/meta-stx/recipes-core/stx-config/files/0001-puppet-manifests-adjust-path-variable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 54a94a0caf6db9e041e3769ae2be830cb0d7ea2f Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Thu, 26 Dec 2019 11:42:23 -0800
-Subject: [PATCH] puppet-manifests: adjust path variable
-
-Issue 54:
-Without this patch, mount command is not found
----
- puppet-manifests/src/modules/platform/manifests/filesystem.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/puppet-manifests/src/modules/platform/manifests/filesystem.pp b/puppet-manifests/src/modules/platform/manifests/filesystem.pp
-index a324ae82..a75f57b5 100644
---- a/puppet-manifests/src/modules/platform/manifests/filesystem.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/filesystem.pp
-@@ -64,7 +64,7 @@ define platform::filesystem (
-   -> exec { "mount ${device}":
-     unless  => "mount | awk '{print \$3}' | grep -Fxq ${mountpoint}",
-     command => "mount ${mountpoint}",
--    path    => '/usr/bin'
-+    path    => '/usr/bin:/usr/sbin:/bin:/sbin'
-   }
- }
- 
--- 
-2.23.0
-
diff --git a/meta-stx/recipes-core/stx-config/files/0001-puppet-manifests-integ-set-correct-ldap-module-path.patch b/meta-stx/recipes-core/stx-config/files/0001-puppet-manifests-integ-set-correct-ldap-module-path.patch
deleted file mode 100644
index c6e7199..0000000
--- a/meta-stx/recipes-core/stx-config/files/0001-puppet-manifests-integ-set-correct-ldap-module-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 32efd8d303556b43005f26715bd8264886e17420 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Wed, 11 Dec 2019 17:24:17 -0800
-Subject: [PATCH] puppet-manifests integ: set correct ldap module path
-
-OE installs ldap modules under libexec.
----
- puppet-manifests/src/modules/platform/manifests/ldap.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/puppet-manifests/src/modules/platform/manifests/ldap.pp b/puppet-manifests/src/modules/platform/manifests/ldap.pp
-index b3d6ee71..7205e7d3 100644
---- a/puppet-manifests/src/modules/platform/manifests/ldap.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/ldap.pp
-@@ -53,7 +53,7 @@ class platform::ldap::server::local
-                           -e 's:serverID.*:serverID ${server_id}:' \\
-                           -e 's:credentials.*:credentials=${admin_pw}:' \\
-                           -e 's:^rootpw .*:rootpw ${admin_hashed_pw}:' \\
--                          -e 's:modulepath .*:modulepath /usr/lib64/openldap:' \\
-+                          -e 's:modulepath .*:modulepath /usr/libexec/openldap:' \\
-                           /etc/openldap/slapd.conf",
-     onlyif  => '/usr/bin/test -e /etc/openldap/slapd.conf'
-   }
--- 
-2.23.0
-
diff --git a/meta-stx/recipes-core/stx-config/files/0001-stx-config-puppet-manifests-cast-to-Integer.patch b/meta-stx/recipes-core/stx-config/files/0001-stx-config-puppet-manifests-cast-to-Integer.patch
deleted file mode 100644
index 9e0ab81..0000000
--- a/meta-stx/recipes-core/stx-config/files/0001-stx-config-puppet-manifests-cast-to-Integer.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bd8abad80bb0b24ed3556e51d345e4364a129c6b Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Mon, 13 Jan 2020 13:11:52 -0800
-Subject: [PATCH] stx-config: puppet-manifests cast to Integer
-
-Use cast operator to convert string to a number
----
- puppet-manifests/src/modules/platform/manifests/params.pp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/puppet-manifests/src/modules/platform/manifests/params.pp b/puppet-manifests/src/modules/platform/manifests/params.pp
-index 9ef50eb2..d99cc609 100644
---- a/puppet-manifests/src/modules/platform/manifests/params.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/params.pp
-@@ -35,9 +35,9 @@ class platform::params (
-   $protected_group_name = 'sys_protected'
-   $protected_group_id = '345'
- 
--  # PUPPET 4 treats custom facts as strings. We convert to int by adding zero.
--  $phys_core_count = 0 + $::physical_core_count
--  $plat_res_mem = 0 + $::platform_res_mem
-+  # To convert a string to a number, cast the type by declaring a new Numeric object.
-+  $phys_core_count = Integer($::physical_core_count)
-+  $plat_res_mem = Integer($::platform_res_mem)
- 
-   # Engineering parameters common to openstack services:
- 
--- 
-2.23.0
-