bolt 0.16.4 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dabc4d0d53c4dc91e19ca332cc074c70026d9934
-  data.tar.gz: e4bd3c566ddb2cb37724de78063c62eafc4e2fef
+  metadata.gz: 91e33f8c654cb910a35ab5584efb6ac4fe2b3005
+  data.tar.gz: 5c2e652d4d607538aa57bf932d43822dbba32e3c
 SHA512:
-  metadata.gz: 579ed3e93ab4dc82d5ded1dedac8f42793217a6832360c13b8594cab22e5b2a6f6222ecb2a280bb7d6024f93374e3caca9037350c6dc05e80856202be813f84c
-  data.tar.gz: 25bff2cb74e014d109f3de109a1bf330a169367a528ffa40b29246020ca905578e90d0c4db08334455cb0d1b2a7ad98e1b8039fce5393546feb0de6947c85528
+  metadata.gz: d78fdf3b548aeaa383afb25d72a9e0df827e3929419e8d745efc1fc2d2fa98015e107c2fdb47ae5315002069a4da2bd7bdc7eaa3dd4adc9cfff5226b80e5e415
+  data.tar.gz: b1ea22fe91aabd4860cbdebb08dd50be7cdd43d18b312f044c5c00e64e0e2ca0de4c09835655e2b153217b756a570991195c6042d9c6e843e60932d89efdcc9f

data/bolt-modules/boltlib/lib/puppet/functions/fail_plan.rb

@@ -1,10 +1,9 @@
+require 'bolt/error'
+
 # Raises a Bolt::PlanFailure exception to signal to callers that the plan failed
 #
 # Plan authors should call this function when their plan is not successful. The
 # error may then be caught by another plans run_plan function or in bolt itself
-
-require 'bolt/error'
-
 Puppet::Functions.create_function(:fail_plan) do
   dispatch :from_args do
     param 'String[1]', :msg

data/bolt-modules/boltlib/lib/puppet/functions/file_upload.rb

@@ -1,3 +1,5 @@
+require 'bolt/error'
+
 # Uploads the given file or directory to the given set of targets and returns the result from each upload.
 #
 # * This function does nothing if the list of targets is empty.
@@ -5,8 +7,6 @@
 # * A target is a String with a targets's hostname or a Target.
 # * The returned value contains information about the result per target.
 #
-require 'bolt/error'
-
 Puppet::Functions.create_function(:file_upload, Puppet::Functions::InternalFunction) do
   dispatch :file_upload do
     scope_param

data/bolt-modules/boltlib/lib/puppet/functions/get_targets.rb

@@ -1,3 +1,5 @@
+require 'bolt/error'
+
 # Parses common ways of referring to targets and returns an array of Targets.
 #
 # Accepts input consisting of
@@ -12,9 +14,6 @@
 # - ['host1', 'group1', 'winrm://host2:54321']
 #
 # Returns an array of unique Targets resolved from any target URIs and groups.
-
-require 'bolt/error'
-
 Puppet::Functions.create_function(:get_targets) do
   dispatch :get_targets do
     param 'Boltlib::TargetSpec', :names

data/bolt-modules/boltlib/lib/puppet/functions/run_command.rb

@@ -1,3 +1,5 @@
+require 'bolt/error'
+
 # Runs a command on the given set of targets and returns the result from each command execution.
 #
 # * This function does nothing if the list of targets is empty.
@@ -5,8 +7,6 @@
 # * A target is a String with a targets's hostname or a Target.
 # * The returned value contains information about the result per target.
 #
-require 'bolt/error'
-
 Puppet::Functions.create_function(:run_command) do
   dispatch :run_command do
     param 'String[1]', :command

data/bolt-modules/boltlib/lib/puppet/functions/run_plan.rb

@@ -1,3 +1,5 @@
+require 'bolt/error'
+
 # Runs the `plan` referenced by its name passing giving arguments to it given as a hash of name to value mappings.
 # A plan is autoloaded from under <root>/plans if not already defined.
 #
@@ -8,8 +10,6 @@
 #   }
 #   run_plan('myplan', { x => 'testing' })
 #
-require 'bolt/error'
-
 Puppet::Functions.create_function(:run_plan, Puppet::Functions::InternalFunction) do
   dispatch :run_plan do
     scope_param

data/bolt-modules/boltlib/lib/puppet/functions/run_task.rb

@@ -1,3 +1,5 @@
+require 'bolt/error'
+
 # Runs a given instance of a `Task` on the given set of targets and returns the result from each.
 #
 # * This function does nothing if the list of targets is empty.
@@ -5,8 +7,6 @@
 # * A target is a String with a targets's hostname or a Target.
 # * The returned value contains information about the result per target.
 #
-require 'bolt/error'
-
 Puppet::Functions.create_function(:run_task) do
   dispatch :run_task do
     param 'String[1]', :task_name

data/bolt-modules/boltlib/lib/puppet/functions/set_var.rb

@@ -0,0 +1,29 @@
+require 'bolt/error'
+
+# Sets a variable { key => value } for a target.
+#
+# This function takes 3 parameters:
+# * A Target object to set the variable for
+# * The key for the variable (String)
+# * The value of the variable (Data)
+#
+# Returns undef.
+Puppet::Functions.create_function(:set_var) do
+  dispatch :set_var do
+    param 'Target', :target
+    param 'String', :key
+    param 'Data', :value
+  end
+
+  def set_var(target, key, value)
+    unless Puppet[:tasks]
+      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
+        Puppet::Pops::Issues::TASK_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, operation: 'set_var'
+      )
+    end
+
+    inventory = Puppet.lookup(:bolt_inventory) { nil }
+
+    inventory.set_var(target, key, value)
+  end
+end

data/bolt-modules/boltlib/lib/puppet/functions/vars.rb

@@ -0,0 +1,27 @@
+require 'bolt/error'
+
+# Returns a hash of the 'vars' (variables) assigned to a target through the
+# inventory file or `set_var` function.
+#
+# Accepts no parameters.
+#
+# Plan authors can call this function on a target to get the variable hash
+# for that target.
+Puppet::Functions.create_function(:vars) do
+  dispatch :vars do
+    param 'Target', :target
+    return_type 'Hash[String, Data]'
+  end
+
+  def vars(target)
+    unless Puppet[:tasks]
+      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
+        Puppet::Pops::Issues::TASK_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, operation: 'set_var'
+      )
+    end
+
+    inventory = Puppet.lookup(:bolt_inventory) { nil }
+
+    inventory.vars(target)
+  end
+end

data/lib/bolt/cli.rb

@@ -24,7 +24,8 @@ module Bolt
   class CLIExit < StandardError; end
 
   class CLI
-    BANNER = <<-HELP.freeze
+    class BoltOptionParser < OptionParser
+      BANNER = <<-HELP.freeze
 Usage: bolt <subcommand> <action> [options]
 
 Available subcommands:
@@ -39,9 +40,9 @@ Available subcommands:
     bolt file upload <src> <dest>    Upload a local file
 
 where [options] are:
-HELP
+      HELP
 
-    TASK_HELP = <<-HELP.freeze
+      TASK_HELP = <<-HELP.freeze
 Usage: bolt task <action> <task> [options] [parameters]
 
 Available actions are:
@@ -52,27 +53,27 @@ Available actions are:
 Parameters are of the form <parameter>=<value>.
 
 Available options are:
-HELP
+      HELP
 
-    COMMAND_HELP = <<-HELP.freeze
+      COMMAND_HELP = <<-HELP.freeze
 Usage: bolt command <action> <command> [options]
 
 Available actions are:
     run                              Run a command remotely
 
 Available options are:
-HELP
+      HELP
 
-    SCRIPT_HELP = <<-HELP.freeze
+      SCRIPT_HELP = <<-HELP.freeze
 Usage: bolt script <action> <script> [[arg1] ... [argN]] [options]
 
 Available actions are:
     run                              Upload a local script and run it remotely
 
 Available options are:
-HELP
+      HELP
 
-    PLAN_HELP = <<-HELP.freeze
+      PLAN_HELP = <<-HELP.freeze
 Usage: bolt plan <action> <plan> [options] [parameters]
 
 Available actions are:
@@ -83,214 +84,266 @@ Available actions are:
 Parameters are of the form <parameter>=<value>.
 
 Available options are:
-HELP
+      HELP
 
-    FILE_HELP = <<-HELP.freeze
+      FILE_HELP = <<-HELP.freeze
 Usage: bolt file <action> [options]
 
 Available actions are:
     upload <src> <dest>              Upload local file <src> to <dest> on each node
 
 Available options are:
-HELP
+      HELP
 
-    COMMANDS = { 'command' => %w[run],
-                 'script'  => %w[run],
-                 'task'    => %w[show run],
-                 'plan'    => %w[show run],
-                 'file'    => %w[upload] }.freeze
-    TRANSPORTS = %w[ssh winrm pcp].freeze
+      # A helper mixin for OptionParser::Switch instances which will allow
+      # us to show/hide particular switch in the help message produced by
+      # the OptionParser#help method on demand.
+      module SwitchHider
+        attr_accessor :hide
 
-    attr_reader :parser, :config
-    attr_accessor :options
-
-    def initialize(argv)
-      Bolt::Logger.initialize_logging
-      @argv    = argv
-      @options = {
-        nodes: []
-      }
-      @config = Bolt::Config.new
-
-      # parse mode and object, use COMMANDS as a whitelist
-      @options[:mode] = argv[0] if COMMANDS.keys.any? { |mode| argv[0] == mode }
-      @options[:object] = argv[1] if COMMANDS.values.flatten.uniq.any? { |object| argv[1] == object }
-      @parser = create_option_parser(@options)
-      @logger = Logging.logger[self]
-    end
-
-    def create_option_parser(results)
-      parser = OptionParser.new('') do |opts|
-        unless results[:mode] == 'plan'
-          opts.on('-n', '--nodes NODES',
-                  'Node(s) to connect to in URI format [protocol://]host[:port] (Optional)',
-                  'Eg. --nodes bolt.puppet.com',
-                  'Eg. --nodes localhost,ssh://nix.com:2222,winrm://windows.puppet.com',
-                  "\n",
-                  '* NODES can either be comma-separated, \'@<file>\' to read',
-                  '* nodes from a file, or \'-\' to read from stdin',
-                  '* Windows nodes must specify protocol with winrm://',
-                  '* protocol is `ssh` by default, may be `ssh` or `winrm`',
-                  '* port defaults to `22` for SSH',
-                  '* port defaults to `5985` or `5986` for WinRM, based on the --[no-]ssl setting') do |nodes|
-            results[:nodes] << get_arg_input(nodes)
-          end
+        def summarize(*args)
+          return self if hide
+          super
         end
-        opts.on('-u', '--user USER',
-                "User to authenticate as (Optional)") do |user|
-          results[:user] = user
+      end
+
+      def initialize(options)
+        super()
+
+        @options = options
+
+        @nodes = define('-n', '--nodes NODES',
+                        'Node(s) to connect to in URI format [protocol://]host[:port] (Optional)',
+                        'Eg. --nodes bolt.puppet.com',
+                        'Eg. --nodes localhost,ssh://nix.com:2222,winrm://windows.puppet.com',
+                        # An empty line in a switch description causes the OptionParser#help
+                        # method to raise an exception. Specifying a line containing only a
+                        # newline is the closest one can get to the empty line without
+                        # triggering that exception.
+                        "\n",
+                        '* NODES can either be comma-separated, \'@<file>\' to read',
+                        '* nodes from a file, or \'-\' to read from stdin',
+                        '* Windows nodes must specify protocol with winrm://',
+                        '* protocol is `ssh` by default, may be `ssh` or `winrm`',
+                        '* port defaults to `22` for SSH',
+                        '* port defaults to `5985` or `5986` for WinRM, based on the --[no-]ssl setting') do |nodes|
+          @options[:nodes] << get_arg_input(nodes)
+        end.extend(SwitchHider)
+        define('-u', '--user USER',
+               'User to authenticate as (Optional)') do |user|
+          @options[:user] = user
         end
-        opts.on('-p', '--password [PASSWORD]',
-                'Password to authenticate with (Optional).',
-                'Omit the value to prompt for the password.') do |password|
+        define('-p', '--password [PASSWORD]',
+               'Password to authenticate with (Optional).',
+               'Omit the value to prompt for the password.') do |password|
           if password.nil?
             STDOUT.print "Please enter your password: "
-            results[:password] = STDIN.noecho(&:gets).chomp
+            @options[:password] = STDIN.noecho(&:gets).chomp
             STDOUT.puts
           else
-            results[:password] = password
+            @options[:password] = password
           end
         end
-        opts.on('--private-key KEY',
-                "Private ssh key to authenticate with (Optional)") do |key|
-          results[:key] = key
+        define('--private-key KEY',
+               'Private ssh key to authenticate with (Optional)') do |key|
+          @options[:key] = key
         end
-        opts.on('--tmpdir DIR',
-                "The directory to upload and execute temporary files on the target (Optional)") do |tmpdir|
-          results[:tmpdir] = tmpdir
+        define('--tmpdir DIR',
+               'The directory to upload and execute temporary files on the target (Optional)') do |tmpdir|
+          @options[:tmpdir] = tmpdir
         end
-        opts.on('-c', '--concurrency CONCURRENCY', Integer,
-                "Maximum number of simultaneous connections " \
-                "(Optional, defaults to 100)") do |concurrency|
-          results[:concurrency] = concurrency
+        define('-c', '--concurrency CONCURRENCY', Integer,
+               'Maximum number of simultaneous connections ' \
+               '(Optional, defaults to 100)') do |concurrency|
+          @options[:concurrency] = concurrency
         end
-        opts.on('--connect-timeout TIMEOUT', Integer,
-                "Connection timeout (Optional)") do |timeout|
-          results[:connect_timeout] = timeout
+        define('--connect-timeout TIMEOUT', Integer,
+               'Connection timeout (Optional)') do |timeout|
+          @options[:connect_timeout] = timeout
         end
-        opts.on('--modulepath MODULES',
-                "List of directories containing modules, " \
-                "separated by #{File::PATH_SEPARATOR}") do |modulepath|
-          results[:modulepath] = modulepath.split(File::PATH_SEPARATOR)
+        define('--modulepath MODULES',
+               'List of directories containing modules, ' \
+               'separated by ' << File::PATH_SEPARATOR) do |modulepath|
+          @options[:modulepath] = modulepath.split(File::PATH_SEPARATOR)
         end
-        opts.on('--params PARAMETERS',
-                "Parameters to a task or plan") do |params|
-          results[:task_options] = parse_params(params)
+        define('--params PARAMETERS',
+               'Parameters to a task or plan') do |params|
+          @options[:task_options] = parse_params(params)
         end
 
-        opts.on('--format FORMAT',
-                "Output format to use: human or json") do |format|
-          results[:format] = format
+        define('--format FORMAT',
+               'Output format to use: human or json') do |format|
+          @options[:format] = format
         end
-        opts.on('--[no-]host-key-check',
-                "Check host keys with SSH") do |host_key_check|
-          results[:host_key_check] = host_key_check
+        define('--[no-]host-key-check',
+               'Check host keys with SSH') do |host_key_check|
+          @options[:host_key_check] = host_key_check
         end
-        opts.on('--[no-]ssl',
-                "Use SSL with WinRM") do |ssl|
-          results[:ssl] = ssl
+        define('--[no-]ssl',
+               'Use SSL with WinRM') do |ssl|
+          @options[:ssl] = ssl
         end
-        opts.on('--transport TRANSPORT', TRANSPORTS,
-                "Specify a default transport: #{TRANSPORTS.join(', ')}") do |t|
-          results[:transport] = t
+        define('--transport TRANSPORT', TRANSPORTS.map(&:to_s),
+               'Specify a default transport: ' << TRANSPORTS.join(', ')) do |t|
+          @options[:transport] = t
         end
-        opts.on('--run-as USER',
-                "User to run as using privilege escalation") do |user|
-          results[:run_as] = user
+        define('--run-as USER',
+               'User to run as using privilege escalation') do |user|
+          @options[:run_as] = user
         end
-        opts.on('--sudo-password [PASSWORD]',
-                'Password for privilege escalation') do |password|
+        define('--sudo-password [PASSWORD]',
+               'Password for privilege escalation') do |password|
           if password.nil?
             STDOUT.print "Please enter your privilege escalation password: "
-            results[:sudo_password] = STDIN.noecho(&:gets).chomp
+            @options[:sudo_password] = STDIN.noecho(&:gets).chomp
             STDOUT.puts
           else
-            results[:sudo_password] = password
+            @options[:sudo_password] = password
           end
         end
-        opts.on('--configfile CONFIG_PATH',
-                'Specify where to load the config file from') do |path|
-          results[:configfile] = path
+        define('--configfile CONFIG_PATH',
+               'Specify where to load the config file from') do |path|
+          @options[:configfile] = path
         end
-        opts.on('--inventoryfile INVENTORY_PATH',
-                'Specify where to load the invenotry file from') do |path|
-          results[:inventoryfile] = path
+        define('--inventoryfile INVENTORY_PATH',
+               'Specify where to load the inventory file from') do |path|
+          @options[:inventoryfile] = path
         end
-        opts.on_tail('--[no-]tty',
-                     "Request a pseudo TTY on nodes that support it") do |tty|
-          results[:tty] = tty
+        define_tail('--[no-]tty',
+                    'Request a pseudo TTY on nodes that support it') do |tty|
+          @options[:tty] = tty
         end
-        opts.on_tail('--noop',
-                     "Execute a task that supports it in noop mode") do |_|
-          results[:noop] = true
+        define_tail('--noop',
+                    'Execute a task that supports it in noop mode') do |_|
+          @options[:noop] = true
         end
-        opts.on_tail('-h', '--help', 'Display help') do |_|
-          results[:help] = true
+        define_tail('-h', '--help', 'Display help') do |_|
+          @options[:help] = true
         end
-        opts.on_tail('--verbose', 'Display verbose logging') do |_|
-          results[:verbose] = true
+        define_tail('--verbose', 'Display verbose logging') do |_|
+          @options[:verbose] = true
         end
-        opts.on_tail('--debug', 'Display debug logging') do |_|
-          results[:debug] = true
+        define_tail('--debug', 'Display debug logging') do |_|
+          @options[:debug] = true
         end
-        opts.on_tail('--version', 'Display the version') do |_|
+        define_tail('--version', 'Display the version') do |_|
           puts Bolt::VERSION
           raise Bolt::CLIExit
         end
+
+        update
       end
 
-      parser.banner = case results[:mode]
-                      when "plan"
+      def update
+        # Update the banner according to the mode
+        self.banner = case @options[:mode]
+                      when 'plan'
                         PLAN_HELP
-                      when "command"
+                      when 'command'
                         COMMAND_HELP
-                      when "script"
+                      when 'script'
                         SCRIPT_HELP
-                      when "task"
+                      when 'task'
                         TASK_HELP
-                      when "file"
+                      when 'file'
                         FILE_HELP
                       else
                         BANNER
                       end
-      parser
-    end
 
-    # Only call after @config has been initialized.
-    def inventory
-      Bolt::Inventory.from_config(@config)
-    end
-    private :inventory
+        # Only show the --nodes switch in the help message produced by
+        # the #help method when not dealing with plans
+        @nodes.hide = (@options[:mode] == 'plan')
+      end
 
-    def parse
-      if @argv.empty?
-        options[:help] = true
+      def parse_params(params)
+        json = get_arg_input(params)
+        JSON.parse(json)
+      rescue JSON::ParserError => err
+        raise Bolt::CLIError, "Unable to parse --params value as JSON: #{err}"
+      end
+
+      def get_arg_input(value)
+        if value.start_with?('@')
+          file = value.sub(/^@/, '')
+          read_arg_file(file)
+        elsif value == '-'
+          STDIN.read
+        else
+          value
+        end
       end
 
-      remaining = handle_parser_errors do
-        parser.permute(@argv)
+      def read_arg_file(file)
+        File.read(file)
+      rescue StandardError => err
+        raise Bolt::CLIError, "Error attempting to read #{file}: #{err}"
       end
+    end
+
+    COMMANDS = { 'command' => %w[run],
+                 'script'  => %w[run],
+                 'task'    => %w[show run],
+                 'plan'    => %w[show run],
+                 'file'    => %w[upload] }.freeze
 
-      # Shortcut to handle help before other errors may be generated
-      options[:mode] = remaining.shift
+    attr_reader :config, :options
 
-      if options[:mode] == 'help'
-        options[:help] = true
+    def initialize(argv)
+      Bolt::Logger.initialize_logging
+      @logger = Logging.logger[self]
 
-        # regenerate options parser with new mode
-        options[:mode] = remaining.shift
-        @parser = create_option_parser(options)
-      end
+      @config = Bolt::Config.new
+
+      @argv = argv
+
+      @options = {
+        nodes: []
+      }
+    end
+
+    # Only call after @config has been initialized.
+    def inventory
+      @inventory ||= Bolt::Inventory.from_config(config)
+    end
+    private :inventory
 
-      if options[:help]
+    def parse
+      parser = BoltOptionParser.new(options)
+
+      if @argv.empty? ||
+         begin
+           # RuboCop apparently doesn't realize this is a block and issues
+           # the Lint/AssignmentInCondition warning for every assignment in
+           # it, so we disable that warning here.
+           # rubocop:disable Lint/AssignmentInCondition
+           remaining = handle_parser_errors do
+             parser.permute(@argv)
+           end
+
+           # Set the mode
+           options[:mode] = remaining.shift
+
+           if options[:mode] == 'help'
+             options[:help] = true
+             options[:mode] = remaining.shift
+           end
+
+           # Update the parser for the new mode
+           parser.update
+
+           options[:help]
+           # rubocop:enable Lint/AssignmentInCondition
+         end
+      then # rubocop:disable Style/MultilineIfThen
         puts parser.help
         raise Bolt::CLIExit
       end
 
-      @config.load_file(options[:configfile])
-      @config.update_from_cli(options)
-      @config.validate
-      Logging.logger[:root].level = @config[:log_level] || :notice
+      config.load_file(options[:configfile])
+      config.update_from_cli(options)
+      config.validate
+      Bolt::Logger.configure(config)
 
       # This section handles parsing non-flag options which are
       # mode specific rather then part of the config
@@ -313,7 +366,9 @@ HELP
       validate(options)
 
       # After validation, initialize inventory and targets. Errors here are better to catch early.
-      options[:targets] = inventory.get_targets(options[:nodes]) if options[:nodes]
+      unless options[:action] == 'show' || options[:mode] == 'plan'
+        options[:targets] = inventory.get_targets(options[:nodes]) if options[:nodes]
+      end
 
       options
     rescue Bolt::Error => e
@@ -321,30 +376,6 @@ HELP
       raise e
     end
 
-    def parse_params(params)
-      json = get_arg_input(params)
-      JSON.parse(json)
-    rescue JSON::ParserError => err
-      raise Bolt::CLIError, "Unable to parse --params value as JSON: #{err}"
-    end
-
-    def get_arg_input(value)
-      if value.start_with?('@')
-        file = value.sub(/^@/, '')
-        read_arg_file(file)
-      elsif value == '-'
-        STDIN.read
-      else
-        value
-      end
-    end
-
-    def read_arg_file(file)
-      File.read(file)
-    rescue StandardError => err
-      raise Bolt::CLIError, "Error attempting to read #{file}: #{err}"
-    end
-
     def validate(options)
       unless COMMANDS.include?(options[:mode])
         raise Bolt::CLIError,
@@ -385,12 +416,6 @@ HELP
         raise Bolt::CLIError, "Option '--nodes' must be specified"
       end
 
-      if %w[task plan].include?(options[:mode]) && @config[:modulepath].nil?
-        raise Bolt::CLIError,
-              "Option '--modulepath' must be specified when using" \
-              " a task or plan"
-      end
-
       if options[:noop] && (options[:mode] != 'task' || options[:action] != 'run')
         raise Bolt::CLIError,
               "Option '--noop' may only be specified when running a task"
@@ -401,6 +426,8 @@ HELP
       yield
     rescue OptionParser::MissingArgument => e
       raise Bolt::CLIError, "Option '#{e.args.first}' needs a parameter"
+    rescue OptionParser::InvalidArgument => e
+      raise Bolt::CLIError, "Invalid parameter specified for option '#{e.args.first}': #{e.args[1]}"
     rescue OptionParser::InvalidOption, OptionParser::AmbiguousOption => e
       raise Bolt::CLIError, "Unknown argument '#{e.args.first}'"
     end
@@ -416,7 +443,7 @@ HELP
       end
 
       if options[:mode] == 'plan' || options[:mode] == 'task'
-        pal = Bolt::PAL.new(@config)
+        pal = Bolt::PAL.new(config)
       end
 
       if options[:action] == 'show'
@@ -443,13 +470,22 @@ HELP
       message = 'There may be processes left executing on some nodes.'
 
       if options[:mode] == 'plan'
-        executor = Bolt::Executor.new(@config, options[:noop], true)
+        unless options[:nodes].empty?
+          if options[:task_options]['nodes']
+            raise Bolt::CLIError,
+                  "A plan's 'nodes' parameter may be specified using the --nodes option, but in that " \
+                  "case it must not be specified as a separate nodes=<value> parameter nor included " \
+                  "in the JSON data passed in the --params option"
+          end
+          options[:task_options]['nodes'] = options[:nodes].join(',')
+        end
+        executor = Bolt::Executor.new(config, options[:noop], true)
         result = pal.run_plan(options[:object], options[:task_options], executor, inventory)
         outputter.print_plan_result(result)
         # An exception would have been raised if the plan failed
         code = 0
       else
-        executor = Bolt::Executor.new(@config, options[:noop])
+        executor = Bolt::Executor.new(config, options[:noop])
         targets = options[:targets]
 
         results = nil
@@ -525,7 +561,7 @@ HELP
     end
 
     def outputter
-      @outputter ||= Bolt::Outputter.for_format(@config[:format])
+      @outputter ||= Bolt::Outputter.for_format(config[:format])
     end
   end
 end