Commit graph

995 commits

Author SHA1 Message Date
Bryan Jen
cc537070e8 Merge pull request #582 from imphil/master
Look for correct sources.list.d file for apt::ppa
2016-02-04 12:29:15 -07:00
Philipp Wagner
a02654e36c Look for correct sources.list.d file for apt::ppa
In Ubuntu 15.10 the path of the apt sources file, which is generated by
apt-add-repository, changed to include the distid. This breaks apt::ppa
idempotency, since it does not recognize the repository is already
added.

Reported on puppet-users as well:
https://groups.google.com/forum/#!topic/puppet-users/YzeMyZYUo98
2016-02-03 17:24:06 +01:00
Philipp Wagner
4d66d23bec Ensure PPAs in tests have valid form
"man apt-add-repository" notes: "REPOSITORY can be either a line that
can be added directly to sources.list(5), in the form ppa:<user>/<ppa-name>
for adding Personal  Package  Archives".

Fix the tests to always use the format ppa:<user>/<ppa-name> when adding
PPAs.
2016-02-03 17:15:00 +01:00
Daniele Sluijters
ddd05418ae Merge pull request #588 from werekraken/modules2873
MODULES-2873 - Avoid multiple package resource declarations
2016-02-02 20:04:23 +01:00
matt.cover
08c8b58264 MODULES-2873 - Avoid duplicate package resources when package_manage => true 2016-02-02 08:54:43 -07:00
Helen
5e6ba08f21 Merge pull request #587 from jbondpdx/master
MODULES-2941: add example to README
2016-01-29 19:25:06 +00:00
jbondpdx
6fa0b9a382 MODULES-2941: added more info about replacing sources.list 2016-01-29 11:11:46 -08:00
jbondpdx
c70491dcef MODULES-2941: add example to README 2016-01-28 11:45:35 -08:00
Helen
7228f4d9af Merge pull request #585 from DavidS/fm-4049-update-msync
(FM-4049) update to modulesync_configs
2016-01-27 16:16:25 +00:00
David Schmitt
10a8e79e7f (FM-4049) Update to current msync configs [2c99161] 2016-01-27 14:53:40 +00:00
JT (Jonny)
bf92497e62 Merge pull request #583 from tdb/fix_ppa_pluses
Handle PPA names that contain a plus character.
2016-01-19 16:09:39 +00:00
Tim Bishop
7fa207e335 Handle PPA names that contain a plus character.
It looks like add-apt-repository changes pluses to underscores when
creating the sources.list.d file. So the name it creates doesn't match
what Puppet expects, and the resource keeps applying on every Puppet
run.

This works around that problem.
2016-01-19 10:38:47 +00:00
Bryan Jen
7aa9778e4d Merge pull request #572 from twc-openstack/master-tempfile-race-condition
Fix apt_key tempfile race condition
2016-01-06 14:38:31 -07:00
Bryan Jen
efc728bfb5 Merge pull request #578 from phervieux/15.10
Add ubuntu 15.10 support
2015-12-15 10:25:01 -07:00
TP Honey
caf5f7a697 Merge pull request #577 from syseleven/pp-2587
fix whitespace in source.list
2015-12-14 11:27:00 +00:00
Andreas Mauf
6698cbe94b MODULES-2889 - remove unneeded whitespace in source.list template 2015-12-14 10:20:40 +01:00
Daniele Sluijters
79ab8af333 Merge pull request #575 from ryayon/master
MODULES-2861: run stages limitation added to the documentation.
2015-12-10 23:55:07 +01:00
Rudy YAYON
cf708a7aad MODULES-2861: run stages limitation added to the documentation 2015-12-10 11:22:22 +01:00
David Schmitt
72528a014c Merge pull request #576 from puppetlabs/2.2.x
Mergeback 2.2.x
2015-12-08 15:09:12 +00:00
Bryan Jen
61804c0324 Merge pull request #573 from HelenCampbell/release2.2.1
Release 2.2.1
2015-11-24 12:04:29 -07:00
Helen Campbell
c14f399659 Release 2.2.1 2015-11-24 15:28:07 +00:00
Clayton O'Neill
ea6a84f336 Fix apt_key tempfile race condition
The Ruby Tempfile class has a finalizer that removes the file when the
GC runs.  It's not predictible when the GC will run, so you have to
ensure that the instance of the class stays in scope for as long as you
need it.

Unfortunately the tempfile method is returning just the filename of the
temporary file, which means it goes out of scope when that method
returns.  This allows the GC to reap it at any time after return.

In both CI and production environments we've seen this race fail,
causing apt-key add to fail a small (2-3%) amount of the time.

This changes the tempfile and source_to_file methods to return the
underlying Tempfile object, pushing it up into the caller's scope.  Both
of the callers immediately use the object to get its filename and then
open the file, eliminating the race.

Tested this by adding 'GC.start; sleep(1)' immediately before the
command is run, to give the GC plenty of time to remove the tempfile if
it was going to.
2015-11-12 14:09:52 +00:00
Patrick Hervieux
b11a45ec69 Add 15.10 support 2015-11-04 16:48:22 +01:00
Bryan Jen
99ea865f43 Merge pull request #569 from DavidS/improve-readme
(MAINT) improve hiera description
2015-10-09 12:21:53 -07:00
David Schmitt
68693418f4 (MAINT) improve hiera description 2015-10-09 13:07:32 +01:00
Hunter Haugen
68deeb6791 Merge pull request #567 from puppetlabs/2.2.x
Mergeback 2.2.x to master
2015-09-29 09:47:13 -07:00
Hunter Haugen
800c8cc1b2 Merge pull request #566 from bmjen/2.2.0-prep
Release prep for 2.2.0
2015-09-25 16:28:11 -07:00
Bryan Jen
a7d0f9fb31 Release prep for 2.2.0 2015-09-25 16:07:57 -07:00
David Schmitt
2778c8588e Merge pull request #564 from rfdrake/apt_pin
Add support for creating pins from main class
2015-09-07 12:11:31 +01:00
Robert Drake
0dce05adae Add support for creating pins from main class
This lets you create apt::pin resources as an apt param hash.  It also
supplies appropriate tests and documentation.
2015-09-04 22:31:13 -04:00
Morgan Haskel
ff37b84980 Merge pull request #562 from RewardGateway/preference_file_name
Corrected regression with preference files name
2015-09-02 13:26:28 -07:00
Vincent
a531b2b424 Corrected regression with preference files name
Signed-off-by: Vincent Deygas <Vincent.Deygas@rewardgateway.com>
2015-09-02 12:06:16 +01:00
Bryan Jen
418820adf3 Merge pull request #560 from mhaskel/MODULES-2446
MODULES-2446 - Fix pinning for backports
2015-08-26 16:45:09 -07:00
Morgan Haskel
9f43b2db26 MODULES-2446 - Fix pinning for backports
The 2.x series added a changed behavior for backport pinning to pin to
origin instead of release. Pinning to release is the correct behavior
for backports though.
2015-08-26 16:29:54 -07:00
Morgan Haskel
3df188f879 Merge pull request #551 from bdellegrazie/MODULES-2269
Expose notify_update to apt::conf
2015-08-17 10:57:37 -07:00
Daniele Sluijters
201d218c5c Merge pull request #557 from fbarbeira/patch-1
Fix path to 'preferences' and 'preferences.d'.
2015-08-17 16:15:04 +02:00
Félix Barbeira
9f55e31316 Fix path to 'preferences' and 'preferences.d'.
If you follow the documentacion, the hiera file does not work.
2015-08-17 14:52:25 +02:00
Brett Delle Grazie
9ad4fd682d MODULES-2269: Expose notify_update setting
* Expose the underlying notify_update setting of the apt::settings resource
This is because not all configuration file changes should trigger an apt::update notification
* apt::pin also shouldn't result in an apt-update call
Adding a pin configuration should apply to the next apt-get update call it shouldn't trigger one itself.
* Added documentation
* Add tests for apt::conf notify_update
2015-08-16 19:16:36 +01:00
Morgan Haskel
849d000ff3 Merge pull request #556 from callahm3/master
Proxy ensure parameter.
2015-08-05 13:19:17 -07:00
Callahan, Michael Joseph
afa4d45ee9 Added an ensure parameter for user control of proxy presence. Defaults to undef to resist breaking any current setup.
added spec entry

Added validation

fixed ensure hash
2015-08-05 16:03:28 -04:00
David Schmitt
f05e43c285 Merge pull request #553 from bmjen/2.1.x_mergeback
2.1.x mergeback
2015-07-28 16:40:30 +01:00
Bryan Jen
18a7369456 Merge pull request #552 from jbondpdx/2.1.x
light edits to apt README
2015-07-27 14:14:31 -07:00
jbondpdx
b085c3787c light edits to apt README 2015-07-27 10:29:01 -07:00
Daniele Sluijters
2cf089576d Merge pull request #545 from raoulbhatia/master
Use Debian's new official mirrors redirector
2015-07-23 14:10:47 +02:00
Bryan Jen
25af5f7752 Merge pull request #550 from mhaskel/2.1.1-prep
2.1.1 prep
2015-07-22 17:32:38 -07:00
Morgan Haskel
479a7683b7 2.1.1 prep 2015-07-22 17:29:56 -07:00
Bryan Jen
1f7cff5705 Merge pull request #549 from mhaskel/merge_master_to_2.1.x
Merge master to 2.1.x
2015-07-22 16:51:27 -07:00
Morgan Haskel
bea5567ec2 Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x 2015-07-22 16:27:54 -07:00
TP Honey
fa86d8ed50 Merge pull request #547 from mhaskel/MODULES-2190
Fix anchor issues
2015-07-21 18:59:19 +01:00
Morgan Haskel
c01e5e29ea Add limitations note 2015-07-21 10:46:34 -07:00