dopi 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a250c86a6a53a6e1d95ad9d7cc1c1a63e32732df
-  data.tar.gz: 3032c907c32e61940080942da31597fa2bc193c8
+  metadata.gz: 76172f4760eaf3ed0a244457346f69b44901e51a
+  data.tar.gz: 22e167ba7260b906a39cd3114056b8b6b2f6c5c0
 SHA512:
-  metadata.gz: 582a10a26ae4ccf6f342ea2c09a1e7fcbc0f4d191651f65c33660b73cf32fdfa71183a82916e8ddeedf848505ffb17f5d032cde86c6c21e4535c79191b7e9b36
-  data.tar.gz: 26f061bea1eb6c87f1f04a65939218bf09353253b7e098f24d3fec55d708a642200067fa175194f806f594318b1f6049ef0b75eec6ac9ba4665f99ec07a7cbc3
+  metadata.gz: e3b32d4ab26d002dc7d6bf90ec174dd6ed39682000919e4d6cdf6024968cc419e6df7563e5cc9590cbc1cdc0680dcb7f697f720f2285e47cd859329f845e0742
+  data.tar.gz: d18f82635f8fe8097b5ef3cb6b7393d0054c12a01bc390ee5c84d4177d5deb2490f95fa83bb8224d5af78faeb5b7d9c50c808b73210e35b01668b7b68c544a0c

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Change Log
 All notable changes to DOPi will be documented in this file.
 
+## [0.18.1] - 2017-05-24
+### Fixed
+- Update dependencies
+
+## [0.18.0] - 2017-05-24
+### Changed
+- Updated the winrm gem to version 2 and migrated the connector to use the new interface
+- The puppet_agent_run plugin for ssh and winrm got an update. It is now possible to configure
+  reruns if there are changes or errors. For more details see the plugin documentation.
+
+### Fixed
+- Winrm now closes the connections correctly.
+
 ## [0.17.0] - 2017-03-28
 ### Added
 - The log format of the trace output now uses the formatter from dopv which is now in dop_common

data/Gemfile

@@ -1,7 +1,11 @@
 source 'https://rubygems.org'
 
 # Use local path as source for dop_common for testing
-# gem 'dop_common', :path => '../dop_common'
+#gem 'dop_common', :path => '../dop_common'
+
+# There are problems with the hiera puppetlabs RPM, so we can't really
+# depend on the hiera gem in the spec file. Make sure this is installed
+gem 'hiera'
 
 # Specify your gem's dependencies in dopi.gemspec
 gemspec

data/Gemfile.lock

@@ -1,90 +1,91 @@
 PATH
   remote: .
   specs:
-    dopi (0.17.0)
+    dopi (0.18.0)
       curses (~> 1)
-      dop_common (~> 0.13, >= 0.13.0)
+      dop_common (~> 0.15, >= 0.15.0)
       gli (~> 2)
       logger-colors (~> 1)
       mcollective-client (~> 2)
       parallel (~> 1)
-      winrm (~> 1)
+      winrm (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.3)
-    curses (1.2.1)
+    curses (1.2.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    dop_common (0.13.0)
+    dop_common (0.15.0)
       hashdiff (~> 0.3, >= 0.3.1)
-      hiera (~> 3)
       lockfile (~> 2)
       rb-inotify (~> 0.9)
+    erubis (2.7.0)
     ffi (1.9.18)
     gli (2.16.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashdiff (0.3.2)
+    hashdiff (0.3.4)
     hiera (3.3.1)
     httpclient (2.8.3)
-    json (2.0.3)
+    json (2.1.0)
     little-plugger (1.1.4)
     lockfile (2.1.3)
     logger-colors (1.0.0)
-    logging (2.2.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mcollective-client (2.10.2)
+    mcollective-client (2.10.4)
       json
       stomp
       systemu
     mixlib-shellout (2.2.7)
     multi_json (1.12.1)
     nori (2.6.0)
-    parallel (1.11.1)
+    parallel (1.11.2)
     rake (12.0.0)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-command (1.0.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-command (1.0.3)
       mixlib-shellout (~> 2.0)
       rspec (~> 3.2)
       rspec-its (~> 1.2)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubyntlm (0.6.1)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubyntlm (0.6.2)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     stomp (1.4.3)
     systemu (2.6.5)
-    winrm (1.8.1)
+    winrm (2.2.3)
       builder (>= 2.1.2)
+      erubis (~> 2.7)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
 
 PLATFORMS
   ruby
@@ -92,6 +93,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   dopi!
+  hiera
   rake
   rspec
   rspec-command

data/Vagrantfile

@@ -35,9 +35,9 @@ Vagrant.configure(2) do |config|
       # disable the default folder sync on the nodes
       # and rsync all the stuff to the puppetmaster
       if node.name == 'puppetmaster.example.com'
-        config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ".bundle/"
+        machine.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ".bundle/"
       else
-        config.vm.synced_folder ".", "/vagrant", disabled: true
+        machine.vm.synced_folder ".", "/vagrant", disabled: true
       end
     end
   end

data/dopi.gemspec

@@ -28,11 +28,11 @@ Gem::Specification.new do |spec|
   # Code quality
   spec.add_development_dependency 'simplecov'
 
-  spec.add_runtime_dependency 'dop_common', '~> 0.13', '>= 0.13.0'
+  spec.add_runtime_dependency 'dop_common', '~> 0.15', '>= 0.15.0'
   spec.add_runtime_dependency 'gli', '~> 2'
   spec.add_runtime_dependency 'logger-colors', '~> 1'
   spec.add_runtime_dependency 'mcollective-client', '~> 2'
-  spec.add_runtime_dependency 'winrm', '~> 1'
+  spec.add_runtime_dependency 'winrm', '~> 2'
   spec.add_runtime_dependency 'parallel', '~> 1'
 
   # curses was removed in ruby 2.1

data/lib/dopi.rb

@@ -10,6 +10,7 @@ require "dopi/command_parser/arguments"
 require "dopi/command_parser/credentials"
 require "dopi/command_parser/exit_code"
 require "dopi/command_parser/output"
+require "dopi/command_parser/puppet_run"
 require "dopi/connector/local"
 require "dopi/connector/ssh"
 require "dopi/connector/winrm"

data/lib/dopi/command.rb

@@ -96,7 +96,13 @@ module Dopi
               log(:info, "#{name} [OK]") if state_done?
             else
               state_fail
-              log(:info, "#{name} [FAILED]")
+              if @is_verify_command
+                log(:info, "#{name} [FAILED]")
+              else
+                log(:error, "#{name} [FAILED]")
+                log_file = @step.plan.context_logger.current_log_file
+                log(:error, "Check the log file #{log_file} for the full debug log of the node")
+              end
             end
           end
         end
@@ -110,10 +116,13 @@ module Dopi
       send_signal(:abort)
     rescue CommandExecutionError => e
       log(:error, "Command failed: #{e.message}", false)
+      log_file = @step.plan.context_logger.current_log_file
+      log(:error, "Check the log file #{log_file} for the full debug log of the node", false)
       Dopi.log.error(e) if DopCommon.config.trace
       state_fail unless noop
     rescue => e
       log(:error, "Unexpected error!!! This is a Bug", false)
+      Dopi.log.error(e.class)
       Dopi.log.error(e.message)
       Dopi.log.error(e.backtrace)
       state_fail unless noop

data/lib/dopi/command/ssh/puppet_agent_run.rb

@@ -6,57 +6,33 @@ module Dopi
     class Ssh
       class PuppetAgentRun < Dopi::Command
         include Dopi::Connector::Ssh
-        include Dopi::CommandParser::Env
-        include Dopi::CommandParser::Arguments
-        include Dopi::CommandParser::ExitCode
-        include Dopi::CommandParser::Output
+        include Dopi::CommandParser::PuppetRun
 
       public
-
-        def initialize(command_parser, step, node, is_verify_command)
-          command_parser.overwrite_defaults = { :plugin_timeout => 1800 }
-          super(command_parser, step, node, is_verify_command)
-        end
-
         def validate
           validate_ssh
-          validate_env
-          validate_arguments
-          validate_exit_code
-          validate_output
+          validate_puppet_run
         end
 
-        def run
-          cmd_stdout, cmd_stderr, cmd_exit_code = ssh_command(env, command_string)
-          check_output(cmd_stdout) &&
-            check_output(cmd_stderr) &&
-            check_exit_code(cmd_exit_code)
+        def initialize(command_parser, step, node, is_verify_command)
+          command_parser.overwrite_defaults = { :plugin_timeout => 1800 }
+          super(command_parser, step, node, is_verify_command)
         end
 
-        def run_noop
-          log(:info, "(NOOP) Executing '#{command_string}' for command #{name}")
+        def puppet_bin
+          '/usr/bin/puppet'
         end
 
-        def expect_exit_codes_defaults
-          [ 0, 2 ]
+        def check_run_lock
+          ssh_command(env, "test -f $(#{puppet_bin} config print statedir)/agent_catalog_run.lock")
         end
 
-        def parse_output_defaults
-          { :error => [
-              '^Error:'
-            ],
-            :warning => [
-              '^Warning:'
-            ]
-          }
+        def puppet_run
+          ssh_command(env, "#{puppet_bin} agent --test --color false #{arguments}")
         end
 
       private
 
-        def command_string
-          "puppet agent --test --color false #{arguments}"
-        end
-
       end
     end
   end

data/lib/dopi/command/winrm/puppet_agent_run.rb

@@ -1,60 +1,45 @@
 #
-# WinRM Puppet Agent Plugin
+# SSH custom command
 #
 module Dopi
   class Command
     class Winrm
       class PuppetAgentRun < Dopi::Command
         include Dopi::Connector::Winrm
-        include Dopi::CommandParser::Arguments
-        include Dopi::CommandParser::ExitCode
-        include Dopi::CommandParser::Output
+        include Dopi::CommandParser::PuppetRun
 
       public
+        def validate
+          validate_winrm
+          validate_puppet_run
+        end
 
         def initialize(command_parser, step, node, is_verify_command)
           command_parser.overwrite_defaults = { :plugin_timeout => 1800 }
           super(command_parser, step, node, is_verify_command)
         end
 
-        def validate
-          validate_winrm
-          validate_arguments
-          validate_exit_code
-          validate_output
+        def puppet_bin
+          'puppet'
         end
 
-        def run
-          cmd_stdout, cmd_stderr, cmd_exit_code = winrm_powershell_command(command_string)
-          check_output(cmd_stdout) &&
-            check_output(cmd_stderr) &&
-            check_exit_code(cmd_exit_code)
+        def check_run_lock_b
+          false
         end
 
-        def run_noop
-          log(:info, "(NOOP) Executing '#{command_string}' for command #{name}")
+        def check_run_lock
+          winrm_powershell_command <<-cmd
+            $Statedir = #{puppet_bin} config print statedir
+            if(-not( Test-Path "$Statedir/agent_catalog_run.lock" )) { exit 1 }
+          cmd
         end
 
-        def expect_exit_codes_defaults
-          [ 0, 2 ]
-        end
-
-        def parse_output_defaults
-          { :error => [
-              '^Error:'
-            ],
-            :warning => [
-              '^Warning:'
-            ]
-          }
+        def puppet_run
+          winrm_powershell_command("#{puppet_bin} agent --test --color false #{arguments}")
         end
 
       private
 
-        def command_string
-          "puppet agent --test --color false #{arguments}"
-        end
-
       end
     end
   end

data/lib/dopi/command_parser/puppet_run.rb

@@ -0,0 +1,149 @@
+#
+# This is a mixin for command plugins that need to parse puppet_run specific
+# options and for some methods to wrap the rerun logic.
+#
+module Dopi
+  module CommandParser
+    module PuppetRun
+      include Dopi::CommandParser::Env
+      include Dopi::CommandParser::Arguments
+      include Dopi::CommandParser::Output
+
+    public
+
+      def validate_puppet_run
+        validate_env
+        validate_arguments
+        validate_output
+        log_validation_method('rerun_on_change_valid?', CommandParsingError)
+        log_validation_method('rerun_on_error_valid?', CommandParsingError)
+        log_validation_method('max_rerun_valid?', CommandParsingError)
+        log_validation_method('wait_if_already_running_valid?', CommandParsingError)
+      end
+
+      def rerun_on_change
+        @rerun_on_change ||= rerun_on_change_valid? ? hash[:rerun_on_change] : false
+      end
+
+      def rerun_on_error
+        @rerun_on_error ||= rerun_on_error_valid? ? hash[:rerun_on_error] : false
+      end
+
+      def max_rerun
+        @max_rerun ||= max_rerun_valid? ? hash[:max_rerun] : 1
+      end
+
+      def wait_if_already_running
+        @wait_if_already_running ||= wait_if_already_running_valid? ? hash[:wait_if_already_running] : true
+      end
+
+      def run
+        runs = 0
+        loop do
+          raise GracefulExit if signals[:stop]
+          if check_run_lock_wrapper
+            if wait_if_already_running
+              log(:info, "Puppet run already in progress, waiting 10s to check again if finished")
+              sleep(10)
+            else
+              log(:error, "Puppet run already in progress and wait_if_already_running = false")
+              return false
+            end
+          else
+            runs += 1
+            if runs < 2
+              log(:info, "Starting Puppet Run")
+            else
+              log(:info, "Starting Puppet Rerun #{runs - 1} of #{max_rerun}")
+            end
+            case puppet_run_wrapper
+            when :done then return true
+            when :change
+              if rerun_on_change
+                if runs < 2
+                  log(:info, "Puppet had changes and rerun_on_change = true")
+                else
+                  log(:warn, "Puppet had still changes after multiple reruns. Please fix your Puppet manifests")
+                end
+                return true if max_rerun < runs
+              else
+                return true
+              end
+            else
+              if rerun_on_error
+                log(:warn, "Puppet had ERRORS during the run and rerun_on_errors = true. Please fix your Puppet manifests")
+                if max_rerun < runs
+                  log(:error, "Puppet had ERRORS during the run! max_reruns (#{max_rerun}) reached!")
+                  return false
+                end
+              else
+                return false
+              end
+            end
+          end
+        end
+      end
+
+      def check_run_lock_wrapper
+        cmd_stdout, cmd_stderr, cmd_exitcode = check_run_lock
+        return true if cmd_exitcode == 0
+        return false
+      end
+
+      # puppet run wrapper method
+      # this will return :done, :change or :error
+      def puppet_run_wrapper
+        cmd_stdout, cmd_stderr, cmd_exitcode = puppet_run
+        return :error   unless (check_output(cmd_stdout) && check_output(cmd_stderr))
+        case cmd_exitcode
+        when 0 then return :done
+        when 2 then return :change
+        else return :error
+        end
+      end
+
+      def parse_output_defaults
+        { :error => [
+            '^Error:'
+          ],
+          :warning => [
+            '^Warning:'
+          ]
+        }
+      end
+
+    private
+
+      def rerun_on_change_valid?
+        return false unless hash.kind_of?(Hash)
+        return false if hash[:rerun_on_change].nil? # is optional
+        hash[:rerun_on_change].kind_of?(TrueClass) or hash[:rerun_on_change].kind_of?(FalseClass) or
+          raise CommandParsingError, "Plugin #{name}: The value for 'rerun_on_change' must be boolean"
+      end
+
+      def rerun_on_error_valid?
+        return false unless hash.kind_of?(Hash)
+        return false if hash[:rerun_on_error].nil? # is optional
+        hash[:rerun_on_error].kind_of?(TrueClass) or hash[:rerun_on_error].kind_of?(FalseClass) or
+          raise CommandParsingError, "Plugin #{name}: The value for 'rerun_on_error' must be boolean"
+      end
+
+      def max_rerun_valid?
+        return false unless hash.kind_of?(Hash)
+        return false if hash[:max_rerun].nil? # is optional
+        hash[:max_rerun].kind_of?(Fixnum) or
+          raise CommandParsingError, "Plugin #{name}: The value for 'max_rerun' has to be a number"
+        hash[:max_rerun] > 0 or
+          raise CommandParsingError, "Plugin #{name}: The value for 'max_rerun' has to be > 0"
+      end
+
+      def wait_if_already_running_valid?
+        return false unless hash.kind_of?(Hash)
+        return false if hash[:wait_if_already_running].nil? # is optional
+        hash[:wait_if_already_running].kind_of?(TrueClass) or hash[:wait_if_already_running].kind_of?(FalseClass) or
+          raise CommandParsingError, "Plugin #{name}: The value for 'wait_if_already_running' must be boolean"
+      end
+
+    end
+  end
+end

data/lib/dopi/connector/winrm.rb

@@ -18,59 +18,63 @@ module Dopi
         validate_credentials
       end
 
-      def winrm_command(command_string)
+      def winrm_command(command_string, use_shell = :cmd)
         cmd_stdout = ""
         cmd_stderr = ""
         log(:debug, "Executing '#{command_string}' for command #{name}")
-        result = winrm.run_cmd(command_string) do |stdout, stderr|
-          unless stdout.nil? or stdout.empty?
-            cmd_stdout << stdout
-            log(:debug, stdout)
-          end
-          unless stderr.nil? or stderr.empty?
-            cmd_stderr << stderr
-            log(:error, stderr)
+        winrm.shell(use_shell) do |shell|
+          result = shell.run(command_string) do |stdout, stderr|
+            unless stdout.nil? or stdout.empty?
+              cmd_stdout << stdout
+              log(:debug, stdout)
+            end
+            unless stderr.nil? or stderr.empty?
+              cmd_stderr << stderr
+              log(:error, stderr)
+            end
           end
+          return [cmd_stdout, cmd_stderr, result.exitcode]
         end
-        winrm.close
-        [cmd_stdout, cmd_stderr, result[:exitcode]]
       end
 
       def winrm_powershell_command(command_string)
-        log(:debug, "Unencoded Powershell command '#{command_string}'")
-        script = WinRM::PowershellScript.new(command_string)
-        winrm_command("powershell -encodedCommand #{script.encoded()}")
+        winrm_command(command_string, :powershell)
       end
 
       def winrm
-        working_command_executor = nil
+        working_winrm_connection = nil
         credentials.each do |credential|
           begin
-            winrm_web_service = WinRM::WinRMWebService.new(
-              endpoint,
-              auth_method(credential),
-              :realm           => credential.realm,
-              :service         => credential.service,
-              :keytab          => credential.keytab,
-              :user            => credential.username,
-              :pass            => credential.password,
-              :disable_sspi    => disable_sspi,
-              :basic_auth_only => basic_auth_only,
-              :ca_trust_path   => ca_trust_path
+            winrm_connection = WinRM::Connection.new(
+              :endpoint          => endpoint,
+              :transport         => auth_method(credential),
+              :realm             => credential.realm,
+              :service           => credential.service,
+              :keytab            => credential.keytab,
+              :user              => credential.username,
+              :password          => credential.password,
+              :disable_sspi      => disable_sspi,
+              :basic_auth_only   => basic_auth_only,
+              :ca_trust_path     => ca_trust_path,
+              :operation_timeout => operation_timeout,
             )
-            winrm_web_service.set_timeout(operation_timeout)
-            command_executor = WinRM::CommandExecutor.new(winrm_web_service)
-            command_executor.open
-            command_executor.run_cmd('exit') # test connection
+            winrm_connection.shell(:cmd) do |shell|
+              output = shell.run('exit') # test connection
+              if output.exitcode == 0
+                working_winrm_connection = winrm_connection
+              end
+            end
           rescue WinRM::WinRMAuthorizationError, GSSAPI::GssApiError => e
             log(:warn, "Unable to login with credential #{credential.name} : #{e.message}")
           rescue SocketError => e
             raise CommandConnectionError,
               "A problem occurred while trying to connect to node #{@node.name} : #{e.message}"
-          else working_command_executor = command_executor
+          rescue WinRM::WinRMWMIError => e
+            raise CommandExecutionError,
+              "A problem occurred while trying to connect to node #{@node.name} : #{e.message}"
           end
         end
-        working_command_executor or
+        working_winrm_connection or
           raise CommandExecutionError,
             "Unable to login with any of the given credentials: #{credentials.map{|c| c.name}.join(', ')}"
       end

data/lib/dopi/version.rb

@@ -1,3 +1,3 @@
 module Dopi
-  VERSION = '0.17.0'
+  VERSION = '0.18.1'
 end

data/spec/fixtures/puppet/manifests/site.pp

@@ -7,6 +7,11 @@ $role = hiera('role')
 class base {
   hiera_include('classes')
 
+  file{'/tmp/testfile':
+    ensure  => present,
+    content => "testdata",
+  }
+
   file{'/usr/libexec/mcollective/':            ensure => directory}
   file{'/usr/libexec/mcollective/mcollective': ensure => directory}
 }

data/spec/fixtures/testenv_plan.yaml

@@ -34,7 +34,7 @@ steps:
       exec: 'rpm'
       arguments: '-ivh https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm'
 
-  - name: 'install puppet on all the nodes'
+  - name: 'install puppet on all the linux nodes'
     nodes_by_config: {os: 'linux'}
     command:
       verify_commands:
@@ -44,6 +44,41 @@ steps:
       exec: 'yum'
       arguments: 'install -y puppet'
 
+  - name: 'install puppet on all the linux nodes'
+    nodes_by_config: {os: 'linux'}
+    command:
+      verify_commands:
+        - plugin: 'ssh/file_exists'
+          file: '/usr/bin/puppet'
+      plugin: 'ssh/custom'
+      exec: 'yum'
+      arguments: 'install -y puppet'
+
+  - name: 'Install chocolatey on all the windows nodes'
+    nodes_by_config: {os: 'windows'}
+    command:
+      verify_commands:
+        - title:  'Check if chocolatey is installed'
+          plugin: 'winrm/powershell'
+          exec:   'choco -?'
+      plugin: 'winrm/powershell'
+      exec: |
+        $Policy = Get-ExecutionPolicy
+        If ($Policy -eq "Restricted") {
+          Set-ExecutionPolicy AllSigned
+        }
+        iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+
+  - name: 'Install puppet on all the windows nodes'
+    nodes_by_config: {os: 'windows'}
+    command:
+      verify_commands:
+        - title:  'Check if puppet is installed'
+          plugin: 'winrm/powershell'
+          exec:   'puppet help'
+      plugin: 'winrm/powershell'
+      exec:   'choco install -y puppet'
+
   - name: 'copy the puppet configuration to the right place'
     roles: 'puppetmaster'
     command:
@@ -129,7 +164,7 @@ steps:
       exec: 'puppet'
       arguments: 'apply /etc/puppet/manifests/site.pp'
 
-  - name: 'Add puppetmaster to all hosts files'
+  - name: 'Add puppetmaster to all hosts files on linux'
     nodes_by_config: {os: 'linux'}
     command:
       verify_commands:
@@ -140,6 +175,19 @@ steps:
       exec: "echo"
       arguments: '"192.168.56.101 puppetmaster.example.com puppetmaster" >> /etc/hosts'
 
+  - name: 'Add puppetmaster to all hosts files on windows'
+    nodes_by_config: {os: 'windows'}
+    command:
+      verify_commands:
+        - plugin: 'winrm/file_contains'
+          file: 'C:\Windows\System32\Drivers\etc\hosts'
+          pattern: 'puppetmaster.example.com'
+      plugin: 'winrm/powershell'
+      exec: "Add-Content"
+      arguments:
+        - 'C:\Windows\System32\Drivers\etc\hosts'
+        - '"`n192.168.56.101 puppetmaster.example.com puppetmaster"'
+
   - name: 'Add broker to all hosts files'
     nodes_by_config: {os: 'linux'}
     command:
@@ -157,3 +205,14 @@ steps:
     command:
       plugin: 'ssh/puppet_agent_run'
       arguments: '--server puppetmaster.example.com'
+
+# There is an issue with the domain name which gets not set
+# by Vagrant
+#  - name: "run puppet on the windows nodes"
+#    nodes_by_config: {os: 'windows'}
+#    command:
+#      - plugin: 'winrm/puppet_agent_run'
+#        arguments: '--server puppetmaster.example.com'
+#        rerun_on_change: true
+#        rerun_on_error: true
+#        max_rerun: 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dopi
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Andreas Zuber
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,20 +101,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -163,14 +163,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +278,7 @@ files:
 - lib/dopi/command_parser/exec.rb
 - lib/dopi/command_parser/exit_code.rb
 - lib/dopi/command_parser/output.rb
+- lib/dopi/command_parser/puppet_run.rb
 - lib/dopi/command_set.rb
 - lib/dopi/connector/local.rb
 - lib/dopi/connector/ssh.rb