diff --git a/manifests/params.pp b/manifests/params.pp index 6700f80..4b04271 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -17,7 +17,7 @@ class cloudkitty::params { $processor_package_name = 'openstack-cloudkitty-processor' $ui_package_name = 'openstack-cloudkitty-ui' $common_package_name = 'openstack-cloudkitty-common' - $cloudkitty_wsgi_script_source = '/usr/lib/python2.7/site-packages/cloudkitty/api/app.wsgi' + $cloudkitty_wsgi_script_source = '/usr/bin/cloudkitty-api' $cloudkitty_wsgi_script_path = '/var/www/cgi-bin/cloudkitty' } 'Debian': { @@ -26,7 +26,7 @@ class cloudkitty::params { $processor_package_name = 'cloudkitty-processor' $ui_package_name = 'cloudkitty-dashboard' $common_package_name = 'cloudkitty-common' - $cloudkitty_wsgi_script_source = '/usr/lib/python2.7/dist-packages/cloudkitty/api/app.wsgi' + $cloudkitty_wsgi_script_source = '/usr/bin/cloudkitty-api' $cloudkitty_wsgi_script_path = '/usr/lib/cgi-bin/cloudkitty' } default: { diff --git a/spec/classes/cloudkitty_wsgi_apache_spec.rb b/spec/classes/cloudkitty_wsgi_apache_spec.rb index 103574c..8eacd85 100644 --- a/spec/classes/cloudkitty_wsgi_apache_spec.rb +++ b/spec/classes/cloudkitty_wsgi_apache_spec.rb @@ -21,7 +21,7 @@ describe 'cloudkitty::wsgi::apache' do :wsgi_process_group => 'cloudkitty', :wsgi_script_dir => platform_params[:wsgi_script_path], :wsgi_script_file => 'app', - :wsgi_script_source => platform_params[:wsgi_script_source], + :wsgi_script_source => '/usr/bin/cloudkitty-api', :custom_wsgi_process_options => {}, :access_log_file => false, :access_log_format => false, @@ -64,7 +64,7 @@ describe 'cloudkitty::wsgi::apache' do :wsgi_process_group => 'cloudkitty', :wsgi_script_dir => platform_params[:wsgi_script_path], :wsgi_script_file => 'app', - :wsgi_script_source => platform_params[:wsgi_script_source], + :wsgi_script_source => '/usr/bin/cloudkitty-api', :custom_wsgi_process_options => { 'python_path' => '/my/python/admin/path', }, @@ -92,12 +92,10 @@ describe 'cloudkitty::wsgi::apache' do when 'Debian' { :wsgi_script_path => '/usr/lib/cgi-bin/cloudkitty', - :wsgi_script_source => '/usr/lib/python2.7/dist-packages/cloudkitty/api/app.wsgi' } when 'RedHat' { :wsgi_script_path => '/var/www/cgi-bin/cloudkitty', - :wsgi_script_source => '/usr/lib/python2.7/site-packages/cloudkitty/api/app.wsgi' } end end