diff --git a/manifests/params.pp b/manifests/params.pp index 617408e..16f48af 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -32,41 +32,64 @@ 'RedHat': { - $sssd_package = 'sssd' - $sssd_service = 'sssd' - $service_ensure = 'running' - $config_file = '/etc/sssd/sssd.conf' - $mkhomedir = true + $sssd_package = 'sssd' + $sssd_service = 'sssd' + $service_ensure = 'running' + $config_file = '/etc/sssd/sssd.conf' + $mkhomedir = true - case $::operatingsystemrelease { + case $::operatingsystem { default: { - fail("operatingsystemrelease is <${::operatingsystemrelease}> and must be in 5, 6 or 7.") - } - /^5/: { - $service_dependencies = ['messagebus'] - $extra_packages = [ - 'authconfig', - ] - $extra_packages_ensure = 'latest' - $manage_oddjobd = false + fail("operatingsystem is <${::operatingsystem}> which is not supported") } - /^6/: { - $service_dependencies = ['messagebus'] - $extra_packages = [ - 'authconfig', - 'oddjob-mkhomedir', - ] - $extra_packages_ensure = 'present' - $manage_oddjobd = true + 'RedHat', 'CentOS': { + case $::operatingsystemmajrelease { + default: { + fail("operatingsystemrelease is <${::operatingsystemrelease}> and must be in 5, 6 or 7.") + } + '5': { + $service_dependencies = ['messagebus'] + $extra_packages = [ + 'authconfig', + ] + $extra_packages_ensure = 'latest' + $manage_oddjobd = false + } + '6': { + $service_dependencies = ['messagebus'] + $extra_packages = [ + 'authconfig', + 'oddjob-mkhomedir', + ] + $extra_packages_ensure = 'present' + $manage_oddjobd = true + } + '7': { + $service_dependencies = [] + $extra_packages = [ + 'authconfig', + 'oddjob-mkhomedir', + ] + $extra_packages_ensure = 'present' + $manage_oddjobd = true + } + } } - /^7/: { - $service_dependencies = [] - $extra_packages = [ - 'authconfig', - 'oddjob-mkhomedir', - ] - $extra_packages_ensure = 'present' - $manage_oddjobd = true + 'Fedora': { + case $::operatingsystemmajrelease { + default: { + fail("operatingsystemrelease is <${::operatingsystemrelease}> and must be in 25 or 26.") + } + '25', '26': { + $service_dependencies = [] + $extra_packages = [ + 'authconfig', + 'oddjob-mkhomedir', + ] + $extra_packages_ensure = 'present' + $manage_oddjobd = true + } + } } } } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 1d095f6..40a3f9c 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -4,8 +4,10 @@ let(:facts) do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => '5.7', - :rubyversion => '1.9.3' + :operatingsystemmajrelease => '5', + :rubyversion => '1.9.3', } end @@ -40,8 +42,10 @@ let(:facts) do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => '5.7', - :rubyversion => '1.8.7' + :operatingsystemmajrelease => '5', + :rubyversion => '1.8.7', } end it do @@ -62,8 +66,10 @@ let(:facts) do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => '4.0', - :rubyversion => '1.9.3' + :operatingsystemmajrelease => '4', + :rubyversion => '1.9.3', } end @@ -78,8 +84,10 @@ let(:facts) do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => '6.6', - :rubyversion => '1.9.3' + :operatingsystemmajrelease => '6', + :rubyversion => '1.9.3', } end @@ -116,8 +124,10 @@ let(:facts) do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => '6.6', - :rubyversion => '1.8.7' + :operatingsystemmajrelease => '6', + :rubyversion => '1.8.7', } end it do @@ -137,8 +147,10 @@ let(:facts) do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => '7.1', - :rubyversion => '1.9.3' + :operatingsystemmajrelease => '7', + :rubyversion => '1.9.3', } end @@ -175,7 +187,9 @@ let(:facts) do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => '7.1', + :operatingsystemmajrelease => '7', :rubyversion => '1.8.7' } end @@ -196,8 +210,10 @@ let(:facts) do { :osfamily => 'Debian', + :operatingsystem => 'Debian', :operatingsystemrelease => '8.1', - :rubyversion => '1.9.3' + :operatingsystemmajrelease => '8', + :rubyversion => '1.9.3', } end @@ -232,7 +248,9 @@ let(:facts) do { :osfamily => 'Debian', + :operatingsystem => 'Debian', :operatingsystemrelease => '8.1', + :operatingsystemmajrelease => '8', :rubyversion => '1.8.7' } end