diff --git a/manifests/params.pp b/manifests/params.pp index 69e6277..056f858 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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 diff --git a/spec/classes/murano_client_spec.rb b/spec/classes/murano_client_spec.rb index c109904..ed79663 100644 --- a/spec/classes/murano_client_spec.rb +++ b/spec/classes/murano_client_spec.rb @@ -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