X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..6bf5013e5d298962c5a54bc395b53a5ec1a8a5ba:/cookbooks/postgresql/providers/execute.rb diff --git a/cookbooks/postgresql/providers/execute.rb b/cookbooks/postgresql/providers/execute.rb index 2b7bd5ff9..c50cb27d5 100644 --- a/cookbooks/postgresql/providers/execute.rb +++ b/cookbooks/postgresql/providers/execute.rb @@ -17,6 +17,8 @@ # limitations under the License. # +use_inline_resources + def load_current_resource @pg = Chef::PostgreSQL.new(new_resource.cluster) @@ -32,11 +34,11 @@ end action :run do options = { :database => new_resource.database, :user => new_resource.user, :group => new_resource.group } - if ::File.exist?(new_resource.command) - @pg.execute(options.merge(:file => new_resource.command)) - else - @pg.execute(options.merge(:command => new_resource.command)) + converge_by "execute #{new_resource.command}" do + if ::File.exist?(new_resource.command) + @pg.execute(options.merge(:file => new_resource.command)) + else + @pg.execute(options.merge(:command => new_resource.command)) + end end - - new_resource.updated_by_last_action(true) end