Trusted will be a reserved word in Puppet 4

Rename the new `trusted` parameter to `trusted_source`.
This commit is contained in:
Morgan Haskel 2015-01-21 10:54:37 -08:00
parent 646b407027
commit 3d25c08ec1
4 changed files with 11 additions and 11 deletions

View file

@ -303,7 +303,7 @@ apt::sources:
* `key_source`: See apt::key
* `pin`: See apt::pin
* `architecture`: can be used to specify for which architectures information should be downloaded. If this option is not set all architectures defined by the APT::Architectures option will be downloaded. Defaults to 'undef' which means all. Example values can be 'i386' or 'i386,alpha,powerpc'
* `trusted` can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. Defaults to false. Can be 'true' or 'false'.
* `trusted_source` can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. Defaults to false. Can be 'true' or 'false'.
### Testing

View file

@ -16,14 +16,14 @@ define apt::source(
$key_source = undef,
$pin = false,
$architecture = undef,
$trusted = false,
$trusted_source = false,
) {
include apt::params
include apt::update
validate_string($architecture)
validate_bool($trusted)
validate_bool($trusted_source)
$sources_list_d = $apt::params::sources_list_d
$provider = $apt::params::provider

View file

@ -55,7 +55,7 @@ describe 'apt::source', :type => :define do
'key_source' => 'http://apt.puppetlabs.com/pubkey.gpg',
'pin' => '10',
'architecture' => 'x86_64',
'trusted' => true,
'trusted_source' => true,
}
end
@ -94,7 +94,7 @@ describe 'apt::source', :type => :define do
}
end
context 'trusted true' do
context 'trusted_source true' do
let :facts do
{
:lsbdistid => 'Debian',
@ -104,8 +104,8 @@ describe 'apt::source', :type => :define do
end
let :params do
{
'include_src' => false,
'trusted' => true,
'include_src' => false,
'trusted_source' => true,
}
end

View file

@ -1,12 +1,12 @@
#file generated by puppet
# <%= @comment %>
<%- if @include_deb then -%>
deb <%- if @architecture or @trusted -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted %>trusted=yes<% end -%>
deb <%- if @architecture or @trusted_source -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
<%- end -%>
<%- if @include_src then -%>
deb-src <%- if @architecture or @trusted -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted %>trusted=yes<% end -%>
deb-src <%- if @architecture or @trusted_source -%>
[<%- if @architecture %>arch=<%= @architecture %> <% end %><% if @trusted_source %>trusted=yes<% end -%>
] <%- end %><%= @location %> <%= @release_real %> <%= @repos %>
<%- end -%>