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 d546aba8e6557ff5a49757b003be9bdb977ece66..50622adce6c5f315e1637d29e12a96b91ac3370e 100644 (file)
--- 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
 
 # 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 5887dcb8b45b00abcadff5c8f83b95e2dedbe329..c933e5cd4bbdf2c017f5224874c3d75dc71443d4 100644 (file)
--- 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 %> 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 -%>
 <% end -%>

diff --git a/cookbooks/apt/templates/default/nginx.list.erb b/cookbooks/apt/templates/default/nginx.list.erb
index 5596a5012d9fc19e9a8fafae3276d20aa7ee47d8..02bab54764a33368b89475de924ea4eea4d3dfc4 100644 (file)
--- 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
 
 # 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 c27441ce4f7fc675db40e91c932136ba0ad8ceaa..1f62a0d01dfba2e6c6f2fa917281dd23cce83c98 100644 (file)
--- 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
 
 # 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