modules/adblockplus/manifests/init.pp - Issue 29481697: Noissue - Merge packages variable correctly of all hiera scopes in adblockplus module

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: modules/adblockplus/manifests/init.pp

Issue 29481697: Noissue - Merge packages variable correctly of all hiera scopes in adblockplus module (Closed)

Patch Set: Created July 6, 2017, 8:01 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: modules/adblockplus/manifests/init.pp

===================================================================

--- a/modules/adblockplus/manifests/init.pp

+++ b/modules/adblockplus/manifests/init.pp

@@ -19,7 +19,7 @@

# [*packages*]

# An array of adblockplus::packages items to set up in this context,

-# i.e. via Hiera.

+# via Hiera, exclusively.

# === Examples:

@@ -39,7 +39,6 @@

class adblockplus (

$authority = hiera('adblockplus::authority', 'adblockplus.org'),

$hosts = hiera_hash('adblockplus::hosts', {}),

- $packages = hiera_array('adblockplus::packages', []),

$users = hiera_hash('adblockplus::users', {}),

) {

@@ -115,6 +114,7 @@

Exec['apt_update'] -> Package<|title != 'python-software-properties'|>

# https://issues.adblockplus.org/ticket/3574#comment:19

+ $packages = hiera_array('adblockplus::packages', []),

ensure_packages($packages)

# https://projects.puppetlabs.com/issues/4145

« no previous file with comments | « no previous file | no next file » | no next file with comments »