From f80ecbd2c8170ffd9b8377026ade2de4403bc04c Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Wed, 11 Dec 2019 11:00:12 +0530 Subject: [PATCH] Fix client_package for RedHat > 7 and Fedora Change-Id: I366241b632b5ea3a232cea86ab1e6d8e40780c20 --- manifests/params.pp | 4 ++-- spec/classes/magnum_client_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 08f12bd..9d5f432 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -18,9 +18,9 @@ class magnum::params { # service names $api_service = 'openstack-magnum-api' $conductor_service = 'openstack-magnum-conductor' - $client_package = 'python2-magnumclient' + $client_package = "python${pyvers}-magnumclient" $wsgi_script_path = '/var/www/cgi-bin/magnum' - $wsgi_script_source = '/usr/lib/python2.7/site-packages/magnum/api/app.wsgi' + $wsgi_script_source = '/usr/bin/magnum-api-wsgi' } 'Debian': { # package names diff --git a/spec/classes/magnum_client_spec.rb b/spec/classes/magnum_client_spec.rb index d997b32..349cc10 100644 --- a/spec/classes/magnum_client_spec.rb +++ b/spec/classes/magnum_client_spec.rb @@ -27,7 +27,7 @@ describe 'magnum::client' do when 'Debian' { :client_package_name => 'python3-magnumclient' } when 'RedHat' - { :client_package_name => 'python2-magnumclient' } + { :client_package_name => 'python-magnumclient' } end end