Unified Diff: modules/adblockplus/manifests/puppet/master.pp
Issue 29367556:
Issue 3065 - Refactor adblockplus::puppet module to include Puppet patches (Closed)
Patch Set: (remove accidental changes)
Created Dec. 15, 2016, 10 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/manifests/puppet/agent.pp ('k')
|
modules/private-stub/hiera/base.yaml » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/adblockplus/manifests/puppet/master.pp |
| =================================================================== |
| --- a/modules/adblockplus/manifests/puppet/master.pp |
| +++ b/modules/adblockplus/manifests/puppet/master.pp |
| @@ -29,12 +29,14 @@ |
| $service = hiera('adblockplus::puppet::master::service', {}), |
| ) { |
| - include adblockplus |
| + include adblockplus::puppet |
| include puppetmaster |
| include stdlib |
| # https://forge.puppet.com/puppetlabs/stdlib#ensure_resource |
| - ensure_resource('package', 'puppetmaster', $package) |
| + ensure_resource('package', 'puppetmaster', merge({ |
| + 'ensure' => $adblockplus::puppet::ensure, |
| + }, $package)) |
| # https://forge.puppet.com/puppetlabs/stdlib#getparam |
| if getparam(Package['puppet'], 'ensure') !~ /^(absent|purged)$/ { |
« no previous file with comments
|
« modules/adblockplus/manifests/puppet/agent.pp ('k')
|
modules/private-stub/hiera/base.yaml » ('j')
|
no next file with comments »
