diff --git a/manifests/params.pp b/manifests/params.pp index 95b1a34b..dc25faec 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,11 +3,9 @@ # Parameters for puppet-manila # class manila::params { - include openstacklib::defaults - $pyvers = $::openstacklib::defaults::pyvers - $client_package = "python${pyvers}-manilaclient" + $client_package = 'python3-manilaclient' $db_sync_command = 'manila-manage db sync' $lio_package_name = 'targetcli' $group = 'manila' diff --git a/spec/classes/manila_client_spec.rb b/spec/classes/manila_client_spec.rb index 5ebf1a11..bfd632af 100644 --- a/spec/classes/manila_client_spec.rb +++ b/spec/classes/manila_client_spec.rb @@ -29,15 +29,7 @@ describe 'manila::client' do when 'Debian' { :client_package => 'python3-manilaclient' } when 'RedHat' - if facts[:operatingsystem] == 'Fedora' - { :client_package => 'python3-manilaclient' } - else - if facts[:operatingsystemmajrelease] > '7' - { :client_package => 'python3-manilaclient' } - else - { :client_package => 'python-manilaclient' } - end - end + { :client_package => 'python3-manilaclient' } end end