From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 13 Mar 2015 21:56:53 +0000 (-0700)
Subject: Update docs and test for $legacy_origin
X-Git-Tag: 1.8.0~5^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=81bb96c898657f7d6045ddeb4b3701ab94cffa4d;p=puppet-modules%2Fpuppetlabs-apt.git

Update docs and test for $legacy_origin
---

diff --git a/README.md b/README.md
index 0bf17c4..501adc6 100644
--- a/README.md
+++ b/README.md
@@ -278,6 +278,7 @@ apt::sources:
 
 ####apt::unattended_upgrades
 
+* `legacy_origin`: If set to true, use the old `Unattended-Upgrade::Allowed-Origins` variable. If false, use `Unattended-Upgrade::Origins-Pattern`. OS-dependent defaults are defined in `apt::params`.
 * `origins`: The repositories from which to automatically upgrade included packages.
 * `blacklist`: A list of packages to **not** automatically upgrade.
 * `update`: How often, in days, to run `apt-get update`.
diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb
index 3742bf1..0a02755 100644
--- a/spec/classes/unattended_upgrades_spec.rb
+++ b/spec/classes/unattended_upgrades_spec.rb
@@ -155,6 +155,7 @@ describe 'apt::unattended_upgrades', :type => :class do
 
     let :params do
       {
+        'legacy_origin'       => true,
         'enable'              => '0',
         'backup_interval'     => '3',
         'backup_level'        => '1',
@@ -181,7 +182,7 @@ describe 'apt::unattended_upgrades', :type => :class do
       }
     end
 
-    it { is_expected.to contain_file("/etc/apt/apt.conf.d/50unattended-upgrades").with_content %r{Unattended-Upgrade::Origins-Pattern \{\n\t"bananas";\n\};} }
+    it { is_expected.to contain_file("/etc/apt/apt.conf.d/50unattended-upgrades").with_content %r{Unattended-Upgrade::Allowed-Origins \{\n\t"bananas";\n\};} }
     it { is_expected.to contain_file("/etc/apt/apt.conf.d/50unattended-upgrades").with_content %r{Unattended-Upgrade::Package-Blacklist \{\n\t"foo";\n\t"bar";\n\};} }
     it { is_expected.to contain_file("/etc/apt/apt.conf.d/50unattended-upgrades").with_content %r{Unattended-Upgrade::AutoFixInterruptedDpkg "false";}}
     it { is_expected.to contain_file("/etc/apt/apt.conf.d/50unattended-upgrades").with_content %r{Unattended-Upgrade::MinimalSteps "true";}}