Fix sous-chefs#570: JNLP Windows slaves broken

Since action DSL is now used in the slave providers, we can’t rely on inheritance anymore.
TalentSoft · Mar 1, 2017 · 13b6188 · 13b6188
1 parent 0fe5286
commit 13b6188
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/libraries/slave_jnlp.rb b/libraries/slave_jnlp.rb
@@ -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)
 

diff --git a/libraries/slave_windows.rb b/libraries/slave_windows.rb
@@ -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:
       #

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs and configures Jenkins CI master & slaves'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '4.2.1'
+version          '4.2.2'
 
 recipe 'jenkins::master', 'Installs a Jenkins master'