Qualify property names

diff --git a/cookbooks/apt/resources/source.rb b/cookbooks/apt/resources/source.rb
index 12325308da674d4b000571e93ea233fb08910ddd..904a97b7446fecb2ac70ed64859aea786cb1b453 100644 (file)
--- a/cookbooks/apt/resources/source.rb
+++ b/cookbooks/apt/resources/source.rb
@@ -33,13 +33,13 @@ def initialize(name, run_context = nil)
 end
 
 action :create do
 end
 
 action :create do

-  if key
+  if new_resource.key

     execute "apt-key-#{new_resource.key}-clean" do
       command "/usr/bin/apt-key adv --batch --delete-key --yes #key}"
       only_if "/usr/bin/apt-key adv --list-keys #{new_resource.key} | fgrep expired"
     end
 
     execute "apt-key-#{new_resource.key}-clean" do
       command "/usr/bin/apt-key adv --batch --delete-key --yes #key}"
       only_if "/usr/bin/apt-key adv --list-keys #{new_resource.key} | fgrep expired"
     end
 

-    if key_url
+    if new_resource.key_url

       execute "apt-key-#{new_resource.key}-install" do
         command "/usr/bin/apt-key adv --fetch-keys #{new_resource.key_url}"
         not_if "/usr/bin/apt-key adv --list-keys #{new_resource.key}"
       execute "apt-key-#{new_resource.key}-install" do
         command "/usr/bin/apt-key adv --fetch-keys #{new_resource.key_url}"
         not_if "/usr/bin/apt-key adv --list-keys #{new_resource.key}"


@@ -55,16 +55,16 @@ action :create do
   end
 
   template source_path do
   end
 
   template source_path do

-    source source_template
+    source new_resource.source_template

     owner "root"
     group "root"
     mode 0o644
     owner "root"
     group "root"
     mode 0o644

-    variables :url => url
+    variables :url => new_resource.url

     notifies :run, "execute[apt-update-#{new_resource.source_name}]"
   end
 
   execute "apt-update-#{new_resource.source_name}" do
     notifies :run, "execute[apt-update-#{new_resource.source_name}]"
   end
 
   execute "apt-update-#{new_resource.source_name}" do

-    action update ? :run : :nothing
+    action new_resource.update ? :run : :nothing

     command "/usr/bin/apt-get update --no-list-cleanup -o Dir::Etc::sourcelist='#{source_path}' -o Dir::Etc::sourceparts='-'"
   end
 end
     command "/usr/bin/apt-get update --no-list-cleanup -o Dir::Etc::sourcelist='#{source_path}' -o Dir::Etc::sourceparts='-'"
   end
 end

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 62641291ad606d601c4d2e23e50405bdbe9067b7..3ba9136613b448f032eb43897a174519c3b4997a 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -60,7 +60,7 @@ property :pid_file, String
 action :create do
   service_variables = new_resource.to_hash
 
 action :create do
   service_variables = new_resource.to_hash
 

-  if environment_file.is_a?(Hash)
+  if new_resource.environment_file.is_a?(Hash)

     template "/etc/default/#{new_resource.service}" do
       cookbook "systemd"
       source "environment.erb"
     template "/etc/default/#{new_resource.service}" do
       cookbook "systemd"
       source "environment.erb"