Skip to content

Commit 38bd29e

Browse files
committed
Fix use of openvox_bootstrap module/plugin
The only thing that was really broken was the version.pp not using openvox_bootstrap::check. But this changes a few other things to make it clear we're not using puppet_agent anymore.
1 parent c958084 commit 38bd29e

6 files changed

Lines changed: 7 additions & 6 deletions

File tree

Puppetfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mod 'puppetlabs-service', '3.1.0'
99
mod 'puppet-openvox_bootstrap', '1.2.0'
1010
mod 'puppetlabs-facts', '1.7.0'
1111

12-
# puppetlabs-puppet_agent deps
12+
# Other core Puppet modules
1313
mod 'puppetlabs-inifile', '6.2.0'
1414
mod 'puppetlabs-apt', '11.1.0'
1515
mod 'puppetlabs-stdlib', '9.7.0'

lib/bolt/config/options.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ module Options
436436
# rubocop:enable Layout/LineLength
437437
type: Hash,
438438
_plugin: true,
439-
_example: { "puppet_library" => { "plugin" => "puppet_agent", "version" => "6.15.0", "_run_as" => "root" } }
439+
_example: { "puppet_library" => { "plugin" => "openvox_bootstrap", "version" => "1.2.0",
440+
"_run_as" => "root" } }
440441
},
441442
"plugins" => {
442443
description: "A map of plugins and their configuration data, where each key is the name of a plugin and " \

modules/puppet_connect/plans/test_input_data.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
}
7979
}
8080

81-
# Bolt defaults to using the "module" based form of the puppet_agent plugin. Connect defaults
81+
# OpenBolt defaults to using the "module" based form of the openvox_bootstrap plugin. Connect defaults
8282
# to using the "task" based form as *only* the task based form in supported in Connect. This check
8383
# ensures that if the default is not being used, only task based plugins are allowed.
8484
$plugin = $target.plugin_hooks["puppet_library"]
85-
$user_configured_plugin = $plugin != { "plugin"=> "puppet_agent", "stop_service"=> true }
85+
$user_configured_plugin = $plugin != { "plugin"=> "openvox_bootstrap", "stop_service"=> true }
8686
if ($user_configured_plugin and $plugin["plugin"] != "task"){
8787
fail_plan("Only task plugins are acceptable for puppet_library hook")
8888
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plan prep::version(TargetSpec $nodes) {
22
$nodes.apply_prep
33

4-
return run_task("puppet_agent::version", $nodes)
4+
return run_task("openvox_bootstrap::check", $nodes)
55
}

spec/integration/apply_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require 'bolt_spec/files'
66
require 'bolt_spec/integration'
77
require 'bolt_spec/project'
8-
require 'bolt_spec/puppet_agent'
8+
require 'bolt_spec/openvox_bootstrap'
99
require 'bolt_spec/run'
1010

1111
TEST_VERSIONS = [

0 commit comments

Comments
 (0)