String $ensure = 'present',
Optional[String] $options = $::apt::ppa_options,
String $ensure = 'present',
Optional[String] $options = $::apt::ppa_options,
- Optional[String] $release = $facts['lsbdistcodename'],
+ Optional[String] $release = fact('os.distro.codename'),
+ Optional[String] $dist = $facts['os']['name'],
Optional[String] $package_name = $::apt::ppa_package,
Boolean $package_manage = false,
) {
unless $release {
Optional[String] $package_name = $::apt::ppa_package,
Boolean $package_manage = false,
) {
unless $release {
- if versioncmp($facts['lsbdistrelease'], '14.10') >= 0 {
- $distid = downcase($facts['lsbdistid'])
+ if versioncmp($facts['os']['release']['full'], '14.10') >= 0 {
+ $distid = downcase($dist)
$dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
$underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
} else {
$dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
$underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
} else {
- if versioncmp($facts['lsbdistrelease'], '15.10') >= 0 {
+ if versioncmp($facts['os']['release']['full'], '15.10') >= 0 and
+ versioncmp($facts['os']['release']['full'], '21.04') < 0 {
$trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
} else {
$trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"
$trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
} else {
$trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"