diff --git a/manifests/init.pp b/manifests/init.pp index 045bada..beafd35 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -9,7 +9,6 @@ # Defaults to present. # class erlang ( - $epel_enable = $erlang::params::epel_enable, $key_signature = $erlang::params::key_signature, $local_repo_location = $erlang::params::local_repo_location, $package_name = $erlang::params::package_name, @@ -26,16 +25,7 @@ include '::erlang::repo::apt' } 'RedHat' : { - if $epel_enable { - # Include epel as this is a requirement for erlang in RHEL6. - include '::epel' - Class['epel'] -> Package[$package_name] - } - - # This is only needed on RHEL5, RHEL6 has erlang in EPEL. - if $::operatingsystemrelease =~ /^5/ { include '::erlang::repo::yum' - } } default : { } diff --git a/manifests/params.pp b/manifests/params.pp index 9b610aa..4c76f91 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,7 +4,6 @@ # operating systems # class erlang::params { - $epel_enable = false case $::osfamily { 'Debian' : { @@ -23,8 +22,8 @@ $local_repo_location = '/etc/yum.repos.d/epel-erlang.repo' $remote_repo_location = 'https://repos.fedorapeople.org/repos/peter/erlang/epel-erlang.repo' } else { - $local_repo_location = undef - $remote_repo_location = undef + $local_repo_location = '/etc/yum.repos.d/erlang-solutions.repo' + $remote_repo_location = 'http://packages.erlang-solutions.com/rpm/centos/erlang_solutions.repo' } $remote_repo_key_location = undef diff --git a/metadata.json b/metadata.json index 43118d3..7dc85a8 100644 --- a/metadata.json +++ b/metadata.json @@ -44,12 +44,14 @@ }, { "name": "puppet", - "version_requirement": "3.x" + "version_requirement": [ + "3.x", + "4.x" + ] } ], "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">=2.0.0 <5.0.0" }, - { "name": "puppetlabs/apt", "version_requirement": ">=2.1.0" }, - { "name": "stahnma/epel", "version_requirement": ">=1.0.0 <2.0.0" } + { "name": "puppetlabs/apt", "version_requirement": ">=2.1.0" } ] }