Merge pull request #145 from OpenVoxProject/fix_openvox_bootstrap_use

Fix use of openvox_bootstrap module/plugin

Author: nmburgan

Puppetfile

@@ -9,7 +9,7 @@ mod 'puppetlabs-service', '3.1.0'
 mod 'puppet-openvox_bootstrap', '1.2.0'
 mod 'puppetlabs-facts', '1.7.0'
 
-# puppetlabs-puppet_agent deps
+# Other core Puppet modules
 mod 'puppetlabs-inifile', '6.2.0'
 mod 'puppetlabs-apt', '11.1.0'
 mod 'puppetlabs-stdlib', '9.7.0'

lib/bolt/config/options.rb

@@ -436,7 +436,8 @@ module Options
           # rubocop:enable Layout/LineLength
           type: Hash,
           _plugin: true,
-          _example: { "puppet_library" => { "plugin" => "puppet_agent", "version" => "6.15.0", "_run_as" => "root" } }
+          _example: { "puppet_library" => { "plugin" => "openvox_bootstrap", "version" => "1.2.0",
+                      "_run_as" => "root" } }
         },
         "plugins" => {
           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

@@ -78,11 +78,11 @@
       }
     }
 
-    # Bolt defaults to using the "module" based form of the puppet_agent plugin. Connect defaults
+    # OpenBolt defaults to using the "module" based form of the openvox_bootstrap plugin. Connect defaults
     # to using the "task" based form as *only* the task based form in supported in Connect. This check
     # ensures that if the default is not being used, only task based plugins are allowed.
     $plugin = $target.plugin_hooks["puppet_library"]
-    $user_configured_plugin = $plugin != { "plugin"=> "puppet_agent", "stop_service"=> true }
+    $user_configured_plugin = $plugin != { "plugin"=> "openvox_bootstrap", "stop_service"=> true }
     if ($user_configured_plugin and $plugin["plugin"] != "task"){
       fail_plan("Only task plugins are acceptable for puppet_library hook")
     }

spec/fixtures/apply/prep/plans/version.pp

@@ -1,5 +1,5 @@
 plan prep::version(TargetSpec $nodes) {
   $nodes.apply_prep
 
-  return run_task("puppet_agent::version", $nodes)
+  return run_task("openvox_bootstrap::check", $nodes)
 }

spec/integration/apply_spec.rb

@@ -5,7 +5,7 @@
 require 'bolt_spec/files'
 require 'bolt_spec/integration'
 require 'bolt_spec/project'
-require 'bolt_spec/puppet_agent'
+require 'bolt_spec/openvox_bootstrap'
 require 'bolt_spec/run'
 
 TEST_VERSIONS = [