Merge pull request #873 from raphink/default_key_options

Add apt::key_options for default apt::key options

diff --cc manifests/init.pp
Simple merge

diff --cc manifests/params.pp
index 65219fef5a7a65967a20a4ceff313641115b739a,4258bbde1a335f773b0806e1f9c8575419a06697..b0c367ca109cb4858df14ee0fbcdc56263d19332
--- 1/manifests/params.pp
--- 2/manifests/params.pp
+++ b/manifests/params.pp
@@@ -16,8 -16,8 +16,9 @@@ class apt::params 
    $conf_d         = "${root}/apt.conf.d"
    $preferences    = "${root}/preferences"
    $preferences_d  = "${root}/preferences.d"
 +  $apt_conf_d     = "${root}/apt.conf.d"
    $keyserver      = 'keyserver.ubuntu.com'
+   $key_options    = undef
    $confs          = {}
    $update         = {}
    $purge          = {}