From a0dc01a655a52d168feb2b2791cee9b71aa58f54 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 24 Aug 2016 20:26:35 +0100 Subject: [PATCH] Fix more uses of deprecated features --- cookbooks/apt/templates/default/default.list.erb | 4 ++-- cookbooks/apt/templates/default/hwraid.list.erb | 4 ++-- cookbooks/apt/templates/default/nginx.list.erb | 4 ++-- cookbooks/apt/templates/default/postgresql.list.erb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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 -- 2.39.5