meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-barbican/puppet-barbican-fix-the-pkg-and-service-names-for-poky-stx.patch

   1 From 647dd40c145c6b52746a21656a3809bf4d016ab3 Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Sat, 14 Mar 2020 19:53:03 +0800
   4 Subject: [PATCH] puppet-barbican: fix the pkg and service names for poky-stx
   5
   6 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
   7 ---
   8  manifests/params.pp | 13 ++++++++++---
   9  1 file changed, 10 insertions(+), 3 deletions(-)
  10
  11 diff --git a/manifests/params.pp b/manifests/params.pp
  12 index 7dc418e..3a678c2 100644
  13 --- a/manifests/params.pp
  14 +++ b/manifests/params.pp
  15 @@ -19,9 +19,16 @@ class barbican::params {
  16        $httpd_config_file            = '/etc/httpd/conf.d/barbican-api.conf'
  17      }
  18      'Debian': {
  19 -      $api_package_name             = 'barbican-api'
  20 -      $worker_package_name          = 'barbican-worker'
  21 -      $worker_service_name          = 'barbican-worker'
  22 +      if ($::operatingsystem == 'poky-stx') {
  23 +        $api_package_name             = 'barbican'
  24 +        $api_service_name             = 'openstack-barbican-api'
  25 +        $worker_package_name          = 'barbican'
  26 +        $worker_service_name          = 'openstack-barbican-worker'
  27 +      } else {
  28 +        $api_package_name             = 'barbican-api'
  29 +        $worker_package_name          = 'barbican-worker'
  30 +        $worker_service_name          = 'barbican-worker'
  31 +      }
  32        $barbican_wsgi_script_path    = '/usr/lib/cgi-bin/barbican'
  33        $barbican_wsgi_script_source  = '/usr/lib/python2.7/dist-packages/barbican/api/app.wsgi'
  34        $httpd_config_file            = '/etc/apache2/conf-available/barbican-api.conf'
  35 --
  36 2.7.4
  37