From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Aug 2016 19:26:35 +0000 (+0100)
Subject: Fix more uses of deprecated features
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a0dc01a655a52d168feb2b2791cee9b71aa58f54

Fix more uses of deprecated features
---

diff --git a/cookbooks/apt/templates/default/default.list.erb b/cookbooks/apt/templates/default/default.list.erb
index d546aba8e..50622adce 100644
--- a/cookbooks/apt/templates/default/default.list.erb
+++ b/cookbooks/apt/templates/default/default.list.erb
@@ -1,4 +1,4 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-deb <%= @url %> <%= node.lsb.codename %> main
-deb-src <%= @url %> <%= node.lsb.codename %> main
+deb <%= @url %> <%= node[:lsb][:codename] %> main
+deb-src <%= @url %> <%= node[:lsb][:codename] %> main
diff --git a/cookbooks/apt/templates/default/hwraid.list.erb b/cookbooks/apt/templates/default/hwraid.list.erb
index 5887dcb8b..c933e5cd4 100644
--- a/cookbooks/apt/templates/default/hwraid.list.erb
+++ b/cookbooks/apt/templates/default/hwraid.list.erb
@@ -4,6 +4,6 @@
 deb <%= @url %> precise main
 deb-src <%= @url %> precise main
 <% else -%>
-deb <%= @url %> <%= node.lsb.codename %> main
-deb-src <%= @url %> <%= node.lsb.codename %> main
+deb <%= @url %> <%= node[:lsb][:codename] %> main
+deb-src <%= @url %> <%= node[:lsb][:codename] %> main
 <% end -%>
diff --git a/cookbooks/apt/templates/default/nginx.list.erb b/cookbooks/apt/templates/default/nginx.list.erb
index 5596a5012..02bab5476 100644
--- a/cookbooks/apt/templates/default/nginx.list.erb
+++ b/cookbooks/apt/templates/default/nginx.list.erb
@@ -1,4 +1,4 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-deb <%= @url %> <%= node.lsb.codename %> nginx
-deb-src <%= @url %> <%= node.lsb.codename %> nginx
+deb <%= @url %> <%= node[:lsb][:codename] %> nginx
+deb-src <%= @url %> <%= node[:lsb][:codename] %> nginx
diff --git a/cookbooks/apt/templates/default/postgresql.list.erb b/cookbooks/apt/templates/default/postgresql.list.erb
index c27441ce4..1f62a0d01 100644
--- a/cookbooks/apt/templates/default/postgresql.list.erb
+++ b/cookbooks/apt/templates/default/postgresql.list.erb
@@ -1,4 +1,4 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-deb <%= @url %> <%= node.lsb.codename %>-pgdg main
-deb-src <%= @url %> <%= node.lsb.codename %>-pgdg main
+deb <%= @url %> <%= node[:lsb][:codename] %>-pgdg main
+deb-src <%= @url %> <%= node[:lsb][:codename] %>-pgdg main