X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsetting.pp;h=b0fb62b1debd8fb5d90c1f86cb0f0bdc5e778a7f;hb=89c747ab3b2caad9b36b8ce53a693537f4db6f36;hp=ab844602326bc166d1cc6bf934db19905cbea098;hpb=911c4de90fc493e4449d42a1ed6ea0e40925b330;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/setting.pp b/manifests/setting.pp index ab84460..b0fb62b 100644 --- a/manifests/setting.pp +++ b/manifests/setting.pp @@ -6,6 +6,7 @@ define apt::setting ( $notify_update = true, ) { + include 'apt::params' if $content and $source { fail('apt::setting cannot have both content and source') } @@ -36,17 +37,17 @@ define apt::setting ( validate_string($content) } - if $setting_type == 'list' { + if ($setting_type == 'list') or ($setting_type == 'pref') { $_priority = '' } else { $_priority = $priority } - $_path = $::apt::config_files[$setting_type]['path'] - $_ext = $::apt::config_files[$setting_type]['ext'] + $_path = $::apt::params::config_files[$setting_type]['path'] + $_ext = $::apt::params::config_files[$setting_type]['ext'] if $notify_update { - $_notify = Exec['apt_update'] + $_notify = Class['apt::update'] } else { $_notify = undef }