diff --git a/manifests/params.pp b/manifests/params.pp index 6cbc26f..c8c9465 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,13 +4,8 @@ # class murano::params { include ::openstacklib::defaults + $pyvers = $::openstacklib::defaults::pyvers - if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or - ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { - $pyvers = '3' - } else { - $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' $default_external_network = 'public' diff --git a/spec/classes/murano_client_spec.rb b/spec/classes/murano_client_spec.rb index 0a1ba49..17c0249 100644 --- a/spec/classes/murano_client_spec.rb +++ b/spec/classes/murano_client_spec.rb @@ -27,11 +27,7 @@ describe 'murano::client' do let :platform_params do case facts[:osfamily] when 'Debian' - if facts[:os_package_type] == 'debian' - { :pythonclient_package_name => 'python3-muranoclient' } - else - { :pythonclient_package_name => 'python-muranoclient' } - end + { :pythonclient_package_name => 'python3-muranoclient' } when 'RedHat' { :pythonclient_package_name => 'python-muranoclient' } end diff --git a/spec/classes/murano_dashboard_spec.rb b/spec/classes/murano_dashboard_spec.rb index 1a69895..b7f54bf 100644 --- a/spec/classes/murano_dashboard_spec.rb +++ b/spec/classes/murano_dashboard_spec.rb @@ -151,7 +151,7 @@ describe 'murano::dashboard' do case facts[:osfamily] when 'Debian' { - :dashboard_package_name => 'python-murano-dashboard', + :dashboard_package_name => 'python3-murano-dashboard', :dashboard_config => '/etc/openstack-dashboard/local_settings.py' } when 'RedHat'