Skip to content

Commit

Permalink
Fix sous-chefs#570: JNLP Windows slaves broken
Browse files Browse the repository at this point in the history
Since action DSL is now used in the slave providers,
we can’t rely on inheritance anymore.
  • Loading branch information
emmanuelguerin committed Mar 1, 2017
1 parent 0fe5286 commit b31c4a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
4 changes: 2 additions & 2 deletions libraries/slave_jnlp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def load_current_resource
super
end

action :create do
do_create
def do_create
super

parent_remote_fs_dir_resource.run_action(:create)

Expand Down
7 changes: 2 additions & 5 deletions libraries/slave_windows.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,8 @@ def load_current_resource
super
end

#
# @see Chef::Resource::JenkinsSlave#action_create
#
action :create do
do_create
def do_create
super

# The following resources are created in the parent:
#
Expand Down

0 comments on commit b31c4a1

Please sign in to comment.