Merge pull request #69 from dougneal/fix-apt-deprecation-warning

Update usage of `apt::source`
alphagov · Feb 7, 2018 · 761eded · 761eded
2 parents c952eec + 3b24ca4
commit 761eded
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -69,11 +69,13 @@
 
   if $repo {
     apt::source { 'aptly':
-      location   => 'http://repo.aptly.info',
-      release    => 'squeeze',
-      repos      => 'main',
-      key_server => $key_server,
-      key        => 'DF32BC15E2145B3FA151AED19E3E53F19C7DE460',
+      location => 'http://repo.aptly.info',
+      release  => 'squeeze',
+      repos    => 'main',
+      key      => {
+        'server' => $key_server,
+        'id'     => 'DF32BC15E2145B3FA151AED19E3E53F19C7DE460',
+      },
     }
 
     Apt::Source['aptly'] -> Class['apt::update'] -> Package['aptly']

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -38,7 +38,10 @@
 
       it "should override apt::source (somekeyserver.com)" do
         should contain_apt__source('aptly').with(
-          :key_server => 'somekeyserver.com',
+          :key => {
+            'server' => 'somekeyserver.com',
+            'id' => 'DF32BC15E2145B3FA151AED19E3E53F19C7DE460'
+          },
         )
       end
     end