Skip to content

Commit 1f583ce

Browse files
committed
Fix apt pin for new version of apt module
* Require package_apt_pin to be a non-empty string or number * Use `nil` instead of empty string in test for empty pin
1 parent 97d0870 commit 1f583ce

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

REFERENCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ Default value: `undef`
725725

726726
##### <a name="-rabbitmq--package_apt_pin"></a>`package_apt_pin`
727727

728-
Data type: `Optional[Variant[Numeric, String]]`
728+
Data type: `Optional[Variant[Numeric, String[1]]]`
729729

730730
Whether to pin the package to a particular source
731731

manifests/init.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
Boolean $management_ssl = true,
379379
Optional[String] $management_hostname = undef,
380380
Optional[String] $node_ip_address = undef,
381-
Optional[Variant[Numeric, String]] $package_apt_pin = undef,
381+
Optional[Variant[Numeric, String[1]]] $package_apt_pin = undef,
382382
String $package_ensure = 'installed',
383383
Optional[String] $package_gpg_key = undef,
384384
Optional[String] $repo_gpg_key = undef,

spec/classes/rabbitmq_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
end
8484

8585
context 'with no pin', if: os_facts['os']['family'] == 'Debian' do
86-
let(:params) { { repos_ensure: true, package_apt_pin: '' } }
86+
let(:params) { { repos_ensure: true, package_apt_pin: nil } }
8787

8888
describe 'it sets up an apt::source' do
8989
it {

0 commit comments

Comments
 (0)