From f6298b468bb4c7d5b5e2f7412370119dfdbce7bb Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 26 Mar 2018 14:09:25 +0800
Subject: [PATCH] Use the pbr generated wsgi binary file located in binary
 folder

Since pbr 1.4.0, wsgi_scripts entrypoing is supported and it will
generated a wsgi compatible binary file.

Change-Id: Icd23a34d98c19aa495c70015c911daad9a863af8
---
 manifests/params.pp                       | 4 ++--
 spec/classes/barbican_wsgi_apache_spec.rb | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 59d1b6b5..84f21e25 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -16,7 +16,7 @@ class barbican::params {
       $worker_package_name          = 'openstack-barbican-worker'
       $worker_service_name          = 'openstack-barbican-worker'
       $barbican_wsgi_script_path    = '/var/www/cgi-bin/barbican'
-      $barbican_wsgi_script_source  = '/usr/lib/python2.7/site-packages/barbican/api/app.wsgi'
+      $barbican_wsgi_script_source  = '/usr/bin/barbican-wsgi-api'
       $httpd_config_file            = '/etc/httpd/conf.d/barbican-api.conf'
     }
     'Debian': {
@@ -24,7 +24,7 @@ class barbican::params {
       $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'
+      $barbican_wsgi_script_source  = '/usr/bin/barbican-wsgi-api'
       $httpd_config_file            = '/etc/apache2/conf-available/barbican-api.conf'
     }
     default: {
diff --git a/spec/classes/barbican_wsgi_apache_spec.rb b/spec/classes/barbican_wsgi_apache_spec.rb
index c0f6e3ac..88468a80 100644
--- a/spec/classes/barbican_wsgi_apache_spec.rb
+++ b/spec/classes/barbican_wsgi_apache_spec.rb
@@ -40,7 +40,7 @@ describe 'barbican::wsgi::apache' do
         :wsgi_process_group          => 'barbican-api',
         :wsgi_script_dir             => platform_params[:wsgi_script_path],
         :wsgi_script_file            => 'main',
-        :wsgi_script_source          => platform_params[:wsgi_script_source],
+        :wsgi_script_source          => '/usr/bin/barbican-wsgi-api',
         :access_log_file             => false,
         :access_log_format           => false,
         :custom_wsgi_process_options => {},
@@ -83,7 +83,7 @@ describe 'barbican::wsgi::apache' do
         :wsgi_process_group          => 'barbican-api',
         :wsgi_script_dir             => platform_params[:wsgi_script_path],
         :wsgi_script_file            => 'main',
-        :wsgi_script_source          => platform_params[:wsgi_script_source],
+        :wsgi_script_source          => '/usr/bin/barbican-wsgi-api',
         :access_log_file             => '/var/log/httpd/access_log',
         :access_log_format           => 'some format',
         :error_log_file              => '/var/log/httpd/error_log',
@@ -111,7 +111,6 @@ describe 'barbican::wsgi::apache' do
           :httpd_service_name => 'apache2',
           :httpd_ports_file   => '/etc/apache2/ports.conf',
           :wsgi_script_path   => '/usr/lib/cgi-bin/barbican',
-          :wsgi_script_source => '/usr/lib/python2.7/dist-packages/barbican/api/app.wsgi',
           :httpd_config_file  => '/etc/apache2/conf-available/barbican-api.conf',
         }
       when 'RedHat'
@@ -119,7 +118,6 @@ describe 'barbican::wsgi::apache' do
           :httpd_service_name => 'httpd',
           :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
           :wsgi_script_path   => '/var/www/cgi-bin/barbican',
-          :wsgi_script_source => '/usr/lib/python2.7/site-packages/barbican/api/app.wsgi',
           :httpd_config_file  => '/etc/httpd/conf.d/barbican-api.conf',
         }
       end