diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-09 12:08:26 -0400 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-09 12:08:26 -0400 |
| commit | e4d777e5ec333c819a6b87b5c0186f67e86361ee (patch) | |
| tree | b36957b74b417e68e9c09bf5300957d2e9f4857e /README | |
| parent | cc53ce119f5b9b239bc1b8cdcaae6a668b8d1f8c (diff) | |
| parent | 3a7dd605e344cd8bdfa33a1fb82bfefe948cbd00 (diff) | |
| download | puppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.gz puppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.bz2 | |
Fix merge conflict in README
Diffstat (limited to 'README')
| -rw-r--r-- | README | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -17,9 +17,11 @@ Ubuntu support is lagging behind but not absent either. ! Upgrade Notice ! - * Several parser functions have been updated: you need to restart your puppet - master, otherwise some nodes may keep on using an old, cached version! - (https://docs.puppetlabs.com/guides/custom_functions.html#gotchas) + * The apt::codename parameter has been removed. In its place, the + debian_codename fact may be overridden via an environment variable. This + will affect all other debian_* facts, and achieve the same result. + + FACTER_debian_codename=jessie puppet agent -t * If you were using custom 50unattended-upgrades.${::lsbdistcodename} in your site_apt, these are no longer supported. You should migrate to passing @@ -97,9 +99,9 @@ Requirements This module needs: -- the lsb module: git://labs.riseup.net/shared-lsb -- the common module: git://labs.riseup.net/shared-common -- the stdlib module: https://forge.puppetlabs.com/puppetlabs/stdlib +- the common module: https://gitlab.com/shared-puppet-modules-group/common +- the lsb module: https://gitlab.com/shared-puppet-modules-group/lsb + (optional but recommended, required on Ubuntu) By default, on normal hosts, this module sets the configuration option DSelect::Clean to 'auto'. On virtual servers, the value is set by default to @@ -226,15 +228,6 @@ Class parameters: class { 'apt': custom_sources_list => template('site_apt/sources.list') } -* codename - - Contains the codename ("squeeze", "wheezy", ...) of the client's release. While - these values come from lsb-release by default, this parameter can be set - manually, e.g. to enable forced upgrades. For example: - - include apt::dist_upgrade - class { 'apt': codename => 'wheezy', notify => Exec['apt_dist-upgrade'] } - * custom_key_dir If you have different apt-key files that you want to get added to your |