X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-barbican%2Fpuppet-barbican-fix-the-pkg-and-service-names-for-poky-stx.patch;fp=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-barbican%2Fpuppet-barbican-fix-the-pkg-and-service-names-for-poky-stx.patch;h=98826e15945e380869bda9d489e9601ed1976612;hb=57fdea704bd62af847872c40508f00aa1d7cac60;hp=0000000000000000000000000000000000000000;hpb=f23f21bccfb750b9e30141fd9676515215ffbc4e;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-support/puppet/files/puppet-barbican/puppet-barbican-fix-the-pkg-and-service-names-for-poky-stx.patch b/meta-stx/recipes-support/puppet/files/puppet-barbican/puppet-barbican-fix-the-pkg-and-service-names-for-poky-stx.patch
new file mode 100644
index 0000000..98826e1
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppet-barbican/puppet-barbican-fix-the-pkg-and-service-names-for-poky-stx.patch
@@ -0,0 +1,37 @@
+From 647dd40c145c6b52746a21656a3809bf4d016ab3 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Sat, 14 Mar 2020 19:53:03 +0800
+Subject: [PATCH] puppet-barbican: fix the pkg and service names for poky-stx
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ manifests/params.pp | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/manifests/params.pp b/manifests/params.pp
+index 7dc418e..3a678c2 100644
+--- a/manifests/params.pp
++++ b/manifests/params.pp
+@@ -19,9 +19,16 @@ class barbican::params {
+       $httpd_config_file            = '/etc/httpd/conf.d/barbican-api.conf'
+     }
+     'Debian': {
+-      $api_package_name             = 'barbican-api'
+-      $worker_package_name          = 'barbican-worker'
+-      $worker_service_name          = 'barbican-worker'
++      if ($::operatingsystem == 'poky-stx') {
++        $api_package_name             = 'barbican'
++        $api_service_name             = 'openstack-barbican-api'
++        $worker_package_name          = 'barbican'
++        $worker_service_name          = 'openstack-barbican-worker'
++      } else {
++        $api_package_name             = 'barbican-api'
++        $worker_package_name          = 'barbican-worker'
++        $worker_service_name          = 'barbican-worker'
++      }
+       $barbican_wsgi_script_path    = '/usr/lib/cgi-bin/barbican'
+       $barbican_wsgi_script_source  = '/usr/lib/python2.7/dist-packages/barbican/api/app.wsgi'
+       $httpd_config_file            = '/etc/apache2/conf-available/barbican-api.conf'
+-- 
+2.7.4
+