vagrant-bolt 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5fba8cd90a1ba29c44dd28d5a1d7d6de8c8276a742386b1f24eacc900e638fc
-  data.tar.gz: 75713e7c5c1f6b1c5e8338ec9a9012188258224c049b22ea8c929fffa15772bd
+  metadata.gz: 5db77647479d994addb8c0d44266d5408001a0035f7d57d913107f88c1290a07
+  data.tar.gz: 5ede9d54e55e4401133fa1ede70d62bf7e9ab6aef4805a9533bc0b106cea7cee
 SHA512:
-  metadata.gz: 469933d26046b905881486ad771febef1310b6a99dc3911df6075ea28b1a62e8e262bb2202c327b837e195b0977548afee47d73b3b63651f760c806ad37badc0
-  data.tar.gz: 0bb43ca82eef7a6aac4a5cbabec09130f9d8d81d19aa3155db7154fbf24174c7bf9c8a18494e162646d9e747c7ecd64ddb7b5fb4e7cd5246a6fdd8fd3d19e30b
+  metadata.gz: 90a889e58965672e19a4b4fdd5e667fe05ace1d96d401481e9c73cfba89cc26e284c557a530902b38b97a8bb1cb68f45e163ffd2ecc3094380c309fe4d38920b
+  data.tar.gz: d25d14d296e07fcf22d8a75612e37525495a4e33d2b2f031b804e9d1ac2e28ab0e82c2bd0352329d4a6cc421a7e22be505d842b0e90d3d804cd207f0659a3d8d

data/.gitignore

@@ -12,4 +12,7 @@ Gemfile.local
 *.bak
 .vagrant
 /modules
+/site-modules
 *.box
+*.rerun.json
+.resource_types

data/.rubocop.yml

@@ -96,14 +96,6 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
-Metrics/MethodLength:
-  Enabled: true
-  ExcludedMethods:
-    - initialize
-    - finalize!
-    - validate
-    - to_proc
-  Max: 25
 Metrics/ClassLength:
   Enabled: false
 Metrics/ModuleLength:

data/.travis.yml

@@ -22,7 +22,7 @@ rvm:
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.4.4
-      env: TEST_VAGRANT_VERSION=v2.2.2
     - rvm: 2.5.0
+      env: TEST_VAGRANT_VERSION=v2.2.9
+    - rvm: 2.6.6
       env: TEST_VAGRANT_VERSION=HEAD

data/CHANGELOG.md

@@ -0,0 +1,66 @@
+# Changelog
+
+## [v0.3.0](https://github.com/oscar-stack/vagrant-bolt/tree/v0.3.0) (2020-06-02)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.2.1...v0.3.0)
+
+**Merged pull requests:**
+
+- Update inventory naming [\#16](https://github.com/oscar-stack/vagrant-bolt/pull/16) ([jarretlavallee](https://github.com/jarretlavallee))
+
+## [v0.2.1](https://github.com/oscar-stack/vagrant-bolt/tree/v0.2.1) (2020-03-23)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.2.0...v0.2.1)
+
+**Closed issues:**
+
+- Replace bolt argument nodes with targets [\#13](https://github.com/oscar-stack/vagrant-bolt/issues/13)
+
+**Merged pull requests:**
+
+- Fix config builder role filtering [\#15](https://github.com/oscar-stack/vagrant-bolt/pull/15) ([jarretlavallee](https://github.com/jarretlavallee))
+
+## [v0.2.0](https://github.com/oscar-stack/vagrant-bolt/tree/v0.2.0) (2020-02-26)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.2...v0.2.0)
+
+**Merged pull requests:**
+
+- Change nodes to targets in config [\#14](https://github.com/oscar-stack/vagrant-bolt/pull/14) ([jarretlavallee](https://github.com/jarretlavallee))
+- Update to Bolt inventory v2 [\#12](https://github.com/oscar-stack/vagrant-bolt/pull/12) ([jarretlavallee](https://github.com/jarretlavallee))
+
+## [v0.1.2](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.2) (2019-10-17)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.1...v0.1.2)
+
+**Merged pull requests:**
+
+- Fix the bolt path issue and create a release [\#11](https://github.com/oscar-stack/vagrant-bolt/pull/11) ([jarretlavallee](https://github.com/jarretlavallee))
+- Fix changelog version tag [\#10](https://github.com/oscar-stack/vagrant-bolt/pull/10) ([jarretlavallee](https://github.com/jarretlavallee))
+
+## [v0.1.1](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.1) (2019-07-01)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.0...v0.1.1)
+
+**Merged pull requests:**
+
+- Add changelog generation [\#9](https://github.com/oscar-stack/vagrant-bolt/pull/9) ([jarretlavallee](https://github.com/jarretlavallee))
+- Clean up command line arguments and paths [\#8](https://github.com/oscar-stack/vagrant-bolt/pull/8) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add connect\_timeout option to inventory [\#7](https://github.com/oscar-stack/vagrant-bolt/pull/7) ([jarretlavallee](https://github.com/jarretlavallee))
+
+## [v0.1.0](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.0) (2018-12-11)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/4574482459a0f320bb6b25557199a1612b19ea72...v0.1.0)
+
+**Merged pull requests:**
+
+- \(SUP-874\) Add a command line interface [\#6](https://github.com/oscar-stack/vagrant-bolt/pull/6) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add Support for config\_builder bolt triggers [\#5](https://github.com/oscar-stack/vagrant-bolt/pull/5) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add Config Options and cleanup some bad code [\#4](https://github.com/oscar-stack/vagrant-bolt/pull/4) ([jarretlavallee](https://github.com/jarretlavallee))
+- Consolidate files and add some spec tests [\#3](https://github.com/oscar-stack/vagrant-bolt/pull/3) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add the ability to use triggers and provisioners [\#2](https://github.com/oscar-stack/vagrant-bolt/pull/2) ([jarretlavallee](https://github.com/jarretlavallee))
+- Initial Implementation [\#1](https://github.com/oscar-stack/vagrant-bolt/pull/1) ([jarretlavallee](https://github.com/jarretlavallee))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 require 'rubygems/version'
 
-vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.2.2'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.2.9'
 
 group :plugins do
   gemspec
@@ -15,6 +15,7 @@ group :development do
   gem 'rubocop'
   gem 'rubocop-rspec'
   gem 'yard', '~> 0.9.16'
+  gem 'github_changelog_generator'
 end
 
 group :test do
@@ -26,11 +27,12 @@ group :test do
                    tag: vagrant_branch
   end
 
-  gem 'vagrant-spec', git: 'https://github.com/hashicorp/vagrant-spec.git'
+  gem 'vagrant-spec', git: 'https://github.com/hashicorp/vagrant-spec.git',
+                   branch: 'master'
 end
 
 group :system_tests do
-  gem 'bolt', ">=1.5.0"
+  gem 'bolt', "~> 2.0.0"
 end
 
 

data/Puppetfile

@@ -2,6 +2,4 @@
 
 forge "http://forge.puppetlabs.com"
 
-moduledir File.join(File.dirname(__FILE__), 'modules')
-
 mod 'puppetlabs-facts', '0.3.1'

data/README.md

@@ -166,7 +166,7 @@ The methods for a bolt command in a trigger allow for a task, plan, or command.
     * Required: `machine` The machine object
     * Optional: `**args` A hash of [Plugin Settings](#plugin-settings) which override any previous config
 
-Example of the arguments can be seen below. 
+An example of the arguments can be seen below.
 
 Run the `facts` task using a specific user and password.
 
@@ -177,13 +177,13 @@ VagrantBolt.task('facts', env, machine, user: 'ubuntu', password: 'testpassword'
 Run the `facts` plan on `server1` and `server2`.
 
 ~~~ruby
-VagrantBolt.plan('facts', env, machine, nodes: [:server1, :server2])
+VagrantBolt.plan('facts', env, machine, targets: [:server1, :server2])
 ~~~
 
-Run the `hostname` command on all nodes.
+Run the `hostname` command on all targets.
 
 ~~~ruby
-VagrantBolt.command('/bin/hostname', env, machine, nodes: 'all')
+VagrantBolt.command('/bin/hostname', env, machine, targets: 'all')
 ~~~
 
 Run the `service::linux` task as `root` to restart `cron` with a specific path to the bolt executable. This configuration specifies params for the `service::linux` task.
@@ -194,7 +194,7 @@ VagrantBolt.task(
   env,
   machine,
   run_as: 'root',
-  bolt_exe: '/usr/local/bin/bolt',
+  bolt_exe: '/opt/puppetlabs/bin/bolt',
   params: { name: "cron", action: "restart" },
 )
 ~~~
@@ -216,24 +216,24 @@ The settings available in the triggers and the provisioner are the same.
 
 * `bolt_exe`
   * Description: A string containing the full path to the bolt executable
-  * Default: `bolt`
+  * Default: `/opt/puppetlabs/bin/bolt` if it exists, else the first `bolt` in the PATH
 * `boltdir`
   * Description: A string containing the bolt working directory
   * Default: The vagrant root
-* `node_list`
-  * Description: A string containing bolt node list in URI format
-    * This will override `nodes` and `excludes`
-  * Default: `%{protocol}://%{ssh_ip}:%{ssh_port}` if `nodes` is not specified
-* `nodes`
+* `target_list`
+  * Description: A string containing bolt target list in URI format
+    * This will override `targets` and `excludes`
+  * Default: `%{protocol}://%{ssh_ip}:%{ssh_port}` if `targets` is not specified
+* `targets`
   * Description: An array of machine names to run the task or plan on
-    * The `node_list` will override this setting.
+    * The `target_list` will override this setting.
     * A special `ALL` string can be used instead of an array to use all active machines in the environment
   * Valid Values: An array of machine symbols or the string "ALL"
   * Default: `[]`
 * `excludes`
   * Description: An array of machine names to not run the task on
-    * The `node_list` will override this setting.
-    * This setting will take precidence over `nodes`
+    * The `target_list` will override this setting.
+    * This setting will take precidence over `targets`
   * Valid Values: An array of machine symbols
   * Default: `[]`
 * `params`
@@ -248,6 +248,8 @@ The settings available in the triggers and the provisioner are the same.
   * Default: The port that vagrant uses to connect to the machine
 * `sudo_password`
   * Description: A string containing the password bolt will use to escalate privileges on the machine
+* `connect_timeout`
+  * Description: A string which controls if the connection timeout for ssh (linux)
 * `host_key_check`
   * Description: A boolean which controls if the connection should check the host key on the remote host (linux)
   * Default: `false`
@@ -258,9 +260,12 @@ The settings available in the triggers and the provisioner are the same.
   * Description: A boolean which controls if the connection should use SSL on with WinRM (Windows)
 * `ssl_verify`
   * Description: A boolean which controls if the connection should verify SSL on with WinRM (Windows)
+* `machine_alias`
+  * Description: A string to use as the machine's alias in the bolt inventory file. Defaults to nil unless `machine_name` is configured in which case it defaults to the machine name.
+* `machine_name`
+  * Description: A string to use as the machine's name in the bolt inventory file. Defaults to the machine name.
 * `modulepath`
   * Description: A string containing the path to bolt modules
-  * Default: `modules` in the vagrant root
 * `tmpdir`
   * Description: A string containing the directory to upload and execute temporary files on the target
 * `verbose`
@@ -276,7 +281,14 @@ The settings available in the triggers and the provisioner are the same.
 * `vars`
   * Description: A hash containing arbitrary data that may be passed to run_* functions or used for logic in plans
 * `facts`
-  * Description: A hash containing observed information about the node including what can be collected by Facter
+  * Description: A hash containing observed information about the target including what can be collected by Facter
+
+**Deprecated Parameters**
+
+* `node_list`
+  * Replaced by `target_list`
+* `nodes`
+  * Replaced by `targets`
 
 Config Builder
 --------------
@@ -311,10 +323,10 @@ vms:
 
 ### Trigger Configuration
 
-Bolt triggers cab be configured at the root or within a VM object. To configure a bolt trigger a few additional params are required. 
+Bolt triggers cab be configured at the root or within a VM object. To configure a bolt trigger a few additional params are required.
 
 * `trigger_type`
-  * Description: A symbol of the trigger type. 
+  * Description: A symbol of the trigger type.
   * Valid Values: `:before` or `:after`
 * `trigger_commands`
   * Description: An array of symbols for the commands to run the trigger on
@@ -366,13 +378,13 @@ Options:
     -u, --[no-]updateinventory       Update the inventory file (defaults to false)
 ~~~
 
-The command can be used to deploy the Puppetfile, for example. 
+The command can be used to deploy the Puppetfile, for example.
 
 ~~~shell
 vagrant bolt puppetfile install
 ~~~
 
-It can be used to run ad-hoc tasks on a node by specifying the node by its machine name.
+It can be used to run ad-hoc tasks on a target by specifying the target by its machine name.
 
 ~~~shell
 vagrant bolt -u task run facts -n server
@@ -380,7 +392,7 @@ vagrant bolt -u task run facts -n server
 
 The `--updateinventory` flag will regenerate the inventory file from the active running machines, however it defaults to being off. In the example above, the inventory file will be updated prior to running the task.
 
-All arguments except for the `-u` will be passed to bolt, so a bolt command like the exaple below can be run. 
+All arguments except for the `-u` will be passed to bolt, so a bolt command like the example below can be run.
 
 ~~~shell
 vagrant bolt command run 'date' -n agent,master
@@ -389,7 +401,7 @@ vagrant bolt command run 'date' -n agent,master
 Other Use Cases
 ---------------
 
-There are some other use cases for Vagrant Bolt. One of which is to not use the triggers or provisioning to run bolt commands on the nodes, but to manage the inventory file for manual testing. This can easily be accomplished by using a trigger to manage the `inventory.yaml` file and specifying the configuration for the nodes in the config based on the options above. Below is an example trigger that will manage a `./inventory.yaml` file for use with external bolt commands. 
+There are some other use cases for Vagrant Bolt. One of which is to not use the triggers or provisioning to run bolt commands on the targets, but to manage the inventory file for manual testing. This can easily be accomplished by using a trigger to manage the `inventory.yaml` file and specifying the configuration for the targets in the config based on the options above. Below is an example trigger that will manage a `./inventory.yaml` file for use with external bolt commands.
 
 ~~~ruby
 require 'vagrant-bolt'
@@ -422,10 +434,10 @@ Requirements
 ------------
 
 * Vagrant 2.2.0+ is required for this plugin.
-* Bolt 1.5+ needs to be installed on the platform machine and accessible on the path. Use the `bolt_exe` config parameter if it is not on the path.
+* Bolt 1.10+ needs to be installed on the platform machine and accessible on the path. Use the `bolt_exe` config parameter if it is not on the path.
 * Ruby 2.3+
 
 Known Issues
 ------------
 
-* Machine names with hyphens in them are not valid in bolt 1.5.0. This is because of <https://tickets.puppetlabs.com/browse/BOLT-1022>.
+* Machine names with hyphens in them are not valid until bolt 1.10.0. Please upgrade to Bolt 1.10.0+ to use hyphens in the machine names.

data/acceptance/components/bolt_spec.rb

@@ -24,7 +24,7 @@ shared_examples 'provider/virtualbox' do |provider, options|
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt task run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt plan run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run})
-      expect(@result.stdout.scan(%r{Successful on 1 node}).size).to eq(3)
+      expect(@result.stdout.scan(%r{Successful on 1 target}).size).to eq(3)
     end
   end
 
@@ -39,7 +39,7 @@ shared_examples 'provider/virtualbox' do |provider, options|
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt task run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt plan run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run})
-      expect(@result.stdout.scan(%r{Successful on 1 node}).size).to eq(3)
+      expect(@result.stdout.scan(%r{Successful on 1 target}).size).to eq(3)
     end
   end
 
@@ -50,18 +50,18 @@ shared_examples 'provider/virtualbox' do |provider, options|
 
     it 'runs a task, plan, and command' do
       expect(@result.exit_code).to eq(0)
-      result = assert_execute('vagrant', 'bolt', 'task', 'run', 'facts', '-n', 'server')
+      result = assert_execute('vagrant', 'bolt', 'task', 'run', 'facts', '-t', 'server')
       expect(result.exit_code).to eq(0)
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: '\/[^\ ]+bolt' 'task' 'run' 'facts'})
-      expect(result.stdout.scan(%r{Successful on 1 node}).size).to eq(1)
-      result = assert_execute('vagrant', 'bolt', 'plan', 'run', 'facts', '-n', 'server')
+      expect(result.stdout.scan(%r{Successful on 1 target}).size).to eq(1)
+      result = assert_execute('vagrant', 'bolt', 'plan', 'run', 'facts', '-t', 'server')
       expect(result.exit_code).to eq(0)
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: '\/[^\ ]+bolt' 'plan' 'run' 'facts'})
-      expect(result.stdout.scan(%r{Successful on 1 node}).size).to eq(1)
-      result = assert_execute('vagrant', 'bolt', 'command', 'run', 'hostname', '-n', 'server')
+      expect(result.stdout.scan(%r{Successful on 1 target}).size).to eq(1)
+      result = assert_execute('vagrant', 'bolt', 'command', 'run', 'hostname', '-t', 'server')
       expect(result.exit_code).to eq(0)
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: '\/[^\ ]+bolt' 'command' 'run'})
-      expect(result.stdout.scan(%r{Successful on 1 node}).size).to eq(1)
+      expect(result.stdout.scan(%r{Successful on 1 target}).size).to eq(1)
     end
   end
 
@@ -79,14 +79,14 @@ shared_examples 'provider/virtualbox' do |provider, options|
       # Check for root level triggers
       result = assert_execute('vagrant', 'provision')
       expect(result.exit_code).to eq(0)
-      # Ensure that the trigger is run on both nodes
+      # Ensure that the trigger is run on both targets
       expect(result.stdout.scan(%r{server[12]:\s+allnodetest}).size).to eq(4)
-      # Ensure that 'nodes = all' includes both nodes
+      # Ensure that 'targets = all' includes both targets
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+allnodetest[^\n]+server[12],server[12]})
       # Ensure that the root level `run_as` is used
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+allnodetest[^\n]+--run-as 'root'})
       ## Configtest
-      # Ensure excludes overrides nodes
+      # Ensure excludes overrides targets
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+configtest[^\n]+server2})
       # Ensure verbose and debug flags are correctly handled
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+configtest[^\n]+--verbose})

data/acceptance/skeletons/advanced/Vagrantfile

@@ -6,7 +6,7 @@ Vagrant.configure('2') do |config|
   # Run a trigger on all nodes after provision
   config.trigger.after :provision do |trigger|
     trigger.ruby do |env, machine|
-      VagrantBolt.command('/bin/echo "allnodetest"', env, machine, nodes: 'all')
+      VagrantBolt.command('/bin/echo "allnodetest"', env, machine, targets: 'all')
     end
   end
   config.vm.define 'server1' do |node|

data/acceptance/skeletons/base/Vagrantfile

@@ -6,6 +6,7 @@ Vagrant.configure('2') do |config|
     node.vm.provision :bolt do |bolt|
       bolt.command = :task
       bolt.name    = "facts"
+      bolt.targets = ['server']
     end
   end
 end

data/lib/vagrant-bolt/command.rb

@@ -42,20 +42,17 @@ class VagrantBolt::Command < Vagrant.plugin('2', :command)
     execute_bolt_command(bolt_args)
   end
 
-  # Run a bolt command with the inventory path, module path, and boltdir
+  # Run a bolt command with the inventory path, and boltdir
   # @param args [Array<String>] An array containing the bolt arguments
   def execute_bolt_command(args)
     bolt_exe = @env.vagrantfile.config.bolt.bolt_exe
-    modulepath = VagrantBolt::Util::Config.full_path(@env.vagrantfile.config.bolt.modulepath, @env.root_path)
-    boltdir = VagrantBolt::Util::Config.full_path(@env.vagrantfile.config.bolt.boltdir, @env.root_path)
+    boltdir = VagrantBolt::Util::Config.relative_path(@env.vagrantfile.config.bolt.boltdir, @env.root_path)
     inventoryfile = VagrantBolt::Util::Bolt.inventory_file(@env)
 
     quoted_args = args.flatten.compact.map { |a| "'#{a}'" }
     command = [
       "\'#{bolt_exe}\'",
       quoted_args,
-      '--modulepath',
-      "\'#{modulepath}\'",
       '--boltdir',
       "\'#{boltdir}\'",
     ]

data/lib/vagrant-bolt/config/bolt.rb

@@ -10,6 +10,7 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   attr_accessor :name
 
   # @!attribute [rw] nodes
+  # DEPRECATED. Use `targets` instead.
   # Note: The `node_list` will override this setting.
   # @return [Array<String, Symbol>, "ALL"] The nodes to run the task or plan on.
   # Valid values are an array of machine names or the string "ALL".
@@ -17,14 +18,15 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
 
   # @!attribute [rw] excludes
   # Note: The `node_list` will override this setting.
-  # Note: This will be merged with `nodes`, with `excludes` taking precidence.
-  # @return [Array<String, Symbol>] The nodes to exclude from running this task or plan on.
+  # Note: This will be merged with `targets`, with `excludes` taking precidence.
+  # @return [Array<String, Symbol>] The targets to exclude from running this task or plan on.
   # Valid values are an array of machine names.
   attr_accessor :excludes
 
   # @!attribute [rw] node_list
+  # DEPRECATED. Use `target_list` instead.
   # This setting overrides `nodes` and needs to be in the `protocol://ipaddress:port` URI format.
-  # @return [String] The bolt node list. This defaults to the currnet node.
+  # @return [String] The bolt node list. This defaults to the currnet machine.
   attr_accessor :node_list
 
   # @!attribute [rw] params
@@ -39,6 +41,17 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   # @return [Boolean] If the command should be run with noop. Only valid with tasks and apply.
   attr_accessor :noop
 
+  # @!attribute [rw] targets
+  # Note: The `target_list` will override this setting.
+  # @return [Array<String, Symbol>, "ALL"] The targets to run the task or plan on.
+  # Valid values are an array of machine names or the string "ALL".
+  attr_accessor :targets
+
+  # @!attribute [rw] target_list
+  # This setting overrides `targets` and needs to be in the `protocol://ipaddress:port` URI format.
+  # @return [String] The bolt target list. This defaults to the currnet machine.
+  attr_accessor :target_list
+
   def initialize
     super
     @args         = UNSET_VALUE
@@ -48,40 +61,32 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
     @node_list    = UNSET_VALUE
     @params       = UNSET_VALUE
     @command      = UNSET_VALUE
+    @targets      = []
+    @target_list  = UNSET_VALUE
   end
 
   def finalize!
     @bolt_exe       = nil if @bolt_exe == UNSET_VALUE
     @boltdir        = nil if @boltdir == UNSET_VALUE
-    @host_key_check = nil if @host_key_check == UNSET_VALUE
-    @modulepath     = nil if @modulepath == UNSET_VALUE
-    @port           = nil if @port == UNSET_VALUE
-    @password       = nil if @password == UNSET_VALUE
-    @private_key    = nil if @private_key == UNSET_VALUE
-    @run_as         = nil if @run_as == UNSET_VALUE
-    @ssl            = nil if @ssl == UNSET_VALUE
-    @ssl_verify     = nil if @ssl_verify == UNSET_VALUE
-    @sudo_password  = nil if @sudo_password == UNSET_VALUE
-    @tmpdir         = nil if @tmpdir == UNSET_VALUE
-    @user           = nil if @user == UNSET_VALUE
-    @verbose        = nil if @verbose == UNSET_VALUE
-    @debug          = nil if @debug == UNSET_VALUE
-
+    super
     @args           = nil if @args == UNSET_VALUE
     @name           = nil if @name == UNSET_VALUE
     @node_list      = nil if @node_list == UNSET_VALUE
     @params         = nil if @params == UNSET_VALUE
     @command        = nil if @command == UNSET_VALUE
     @noop           = nil if @noop == UNSET_VALUE
+    # Use nodes if targets is not specified.
+    @targets        = @nodes if @targets.empty?
+    @target_list    = @node_list if (@target_list == UNSET_VALUE) || @target_list.nil?
   end
 
   def merge(other)
     super.tap do |result|
       new_excludes = (excludes + other.excludes.dup).flatten.uniq
       result.instance_variable_set(:@excludes, new_excludes.to_a)
-      unless nodes.to_s.casecmp("all").zero?
-        new_nodes = (nodes + other.nodes.dup).flatten.uniq
-        result.instance_variable_set(:@nodes, new_nodes.to_a)
+      unless targets.to_s.casecmp("all").zero?
+        new_targets = (targets + other.targets.dup).flatten.uniq
+        result.instance_variable_set(:@targets, new_targets.to_a)
       end
     end
   end
@@ -90,9 +95,9 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
     errors = _detected_errors
     errors << I18n.t('vagrant-bolt.config.bolt.errors.invalid_command', command: @command.to_s) if !@command.nil? && !['task', 'plan', 'command'].include?(@command.to_s)
 
-    if @nodes.nil? || (!(@nodes.is_a? Array) && !@nodes.to_s.casecmp("all").zero?)
+    if @targets.nil? || (!(@targets.is_a? Array) && !@targets.to_s.casecmp("all").zero?)
       errors << I18n.t('vagrant-bolt.config.bolt.errors.invalid_data_command',
-                       item: 'nodes',
+                       item: 'targets',
                        command: 'array')
     end
 
@@ -121,8 +126,10 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   def blacklist
     [
       'nodes',
+      'targets',
       'excludes',
       'node_list',
+      'target_list',
       'bolt_exe',
       'args',
       'command',