X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=ba05485c31c2ed5792cab8f0ae0a5fb85660627b;hb=a3b82bc64f4c643631f7841119518dc2ec09fdac;hp=bdc3593be845de50353198bc77cc0fc40a0d5b0b;hpb=6c1fd8e819cc8ffb44ac187bb0fa7051d2958cc6;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index bdc3593..ba05485 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -13,6 +13,10 @@ # Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint). # Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename. # +# @param dist +# Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint). +# Specifies the distribution of your node. Valid options: a string containing a valid distribution codename. +# # @param package_name # Names the package that provides the `apt-add-repository` command. Default: 'software-properties-common'. # @@ -23,19 +27,20 @@ define apt::ppa( String $ensure = 'present', Optional[String] $options = $::apt::ppa_options, Optional[String] $release = $facts['lsbdistcodename'], + Optional[String] $dist = $facts['lsbdistid'], Optional[String] $package_name = $::apt::ppa_package, Boolean $package_manage = false, ) { unless $release { - fail('lsbdistcodename fact not available: release parameter required') + fail(translate('lsbdistcodename fact not available: release parameter required')) } - if $facts['lsbdistid'] == 'Debian' { - fail('apt::ppa is not currently supported on Debian.') + if $dist == 'Debian' { + fail(translate('apt::ppa is not currently supported on Debian.')) } if versioncmp($facts['lsbdistrelease'], '14.10') >= 0 { - $distid = downcase($facts['lsbdistid']) + $distid = downcase($dist) $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2") $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2") } else {