X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-barbican%2Fpuppet-barbican-do-not-fail-for-poky-stx.patch;fp=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-barbican%2Fpuppet-barbican-do-not-fail-for-poky-stx.patch;h=d6cd7baeb640d9e0c43f512f5358cb8a9c8ff1a4;hb=57fdea704bd62af847872c40508f00aa1d7cac60;hp=0000000000000000000000000000000000000000;hpb=f23f21bccfb750b9e30141fd9676515215ffbc4e;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-support/puppet/files/puppet-barbican/puppet-barbican-do-not-fail-for-poky-stx.patch b/meta-stx/recipes-support/puppet/files/puppet-barbican/puppet-barbican-do-not-fail-for-poky-stx.patch
new file mode 100644
index 0000000..d6cd7ba
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppet-barbican/puppet-barbican-do-not-fail-for-poky-stx.patch
@@ -0,0 +1,29 @@
+From fd7e40080bc5681376d91aff3956004c6ad2bfc7 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Sat, 14 Mar 2020 20:12:45 +0800
+Subject: [PATCH] puppet-barbican: do not fail for poky-stx
+
+poky-stx is set as Debian osfamily, but we still use barbican-api
+as $service_name, so do not fail for it.
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ manifests/api.pp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manifests/api.pp b/manifests/api.pp
+index a31088b..6716588 100644
+--- a/manifests/api.pp
++++ b/manifests/api.pp
+@@ -486,7 +486,7 @@ the future release. Please use barbican::api::package_ensure instead.")
+   }
+ 
+   if $service_name == 'barbican-api' {
+-    if $::osfamily == 'Debian' {
++    if $::osfamily == 'Debian' and $::operatingsystem != 'poky-stx' {
+       fail('On Debian family the service_name must be set to httpd as there is no eventlet init script.')
+     }
+     service { 'barbican-api':
+-- 
+2.7.4
+