diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-11 10:49:27 -0400 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-11 12:01:35 -0400 |
| commit | d007a403330c553d925b1b4888d93962a5f83f99 (patch) | |
| tree | 005b4ef8a8fc558a6cb143b3252e8694eada215c /manifests/preferences.pp | |
| parent | 87bfb868d7625100086a26a81743f5adbabbb988 (diff) | |
| download | puppet-apt-d007a403330c553d925b1b4888d93962a5f83f99.tar.gz puppet-apt-d007a403330c553d925b1b4888d93962a5f83f99.tar.bz2 | |
Replace debian_*() parser functions with facts
* Removes dependency on lsb-release and/or Facter >1.7
(values are based on $::lsbdistcodename, when available)
* Simplifies maintenance: only lib/facter/util/* require updates as new
releases are made
Caveats:
* apt::codename is removed; to override debian_* facts, set the
FACTER_debian_codename environment variable for puppet
* If tracking unstable, make sure lsb-release is installed, as other
methods can't tell between testing and unstable
Diffstat (limited to 'manifests/preferences.pp')
| -rw-r--r-- | manifests/preferences.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 9ed24c1..6982ca0 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -2,8 +2,8 @@ class apt::preferences { $pref_contents = $apt::custom_preferences ? { '' => $::operatingsystem ? { - 'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"), - 'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"), + 'debian' => template("apt/${::operatingsystem}/preferences_${::debian_codename}.erb"), + 'ubuntu' => template("apt/${::operatingsystem}/preferences_${::ubuntu_codename}.erb"), }, default => $apt::custom_preferences } |