openstack
/
puppet-murano
Code Issues Proposed changes

Merge "Get rid of the $pyvers variable"

This commit is contained in:
Zuul 2021-06-07 12:43:04 +00:00 committed by Gerrit Code Review
parent 11cd02aafc 8f301a178e
commit 9f12d78a9d
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/params.pp
View File

@ -4,7 +4,6 @@
#
class murano::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$dbmanage_command = 'murano-db-manage --config-file /etc/murano/murano.conf upgrade'
$cfapi_dbmanage_command = 'murano-cfapi-db-manage --config-file /etc/murano/murano-cfapi.conf upgrade'
@ -12,7 +11,7 @@ class murano::params {
# service names
$api_service_name = 'murano-api'
$engine_service_name = 'murano-engine'
$pythonclient_package_name = "python${pyvers}-muranoclient"
$pythonclient_package_name = 'python3-muranoclient'
$group = 'murano'
case $::osfamily {
@ -34,7 +33,7 @@ class murano::params {
$cfapi_package_name = 'murano-cfapi'
$common_package_name = 'murano-common'
$engine_package_name = 'murano-engine'
$dashboard_package_name = "python${pyvers}-murano-dashboard"
$dashboard_package_name = 'python3-murano-dashboard'
# service names
$cfapi_service_name = 'murano-cfapi'
# dashboard config file

10
spec/classes/murano_client_spec.rb
View File

@ -29,15 +29,7 @@ describe 'murano::client' do
when 'Debian'
{ :pythonclient_package_name => 'python3-muranoclient' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :pythonclient_package_name => 'python3-muranoclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :pythonclient_package_name => 'python3-muranoclient' }
else
{ :pythonclient_package_name => 'python-muranoclient' }
end
end
{ :pythonclient_package_name => 'python3-muranoclient' }
end
end