Merge pull request #509 from ripienaar/506

(#506) Updates for UX consistency wrt Plan vs Playbook
choria-legacy · Jun 6, 2018 · 699c95f · 699c95f
2 parents 8b97821 + 4af7c12
commit 699c95f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/mcollective/application/playbook.rb b/lib/mcollective/application/playbook.rb
@@ -94,7 +94,7 @@ def run
 
           self.class.option :__modulepath,
                             :arguments => ["--modulepath PATH"],
-                            :description => "Path to find Puppet module when using the Plan DSL",
+                            :description => "Path to find Puppet module when using the Playbook DSL",
                             :type => String
 
           self.class.option :__loglevel,
@@ -178,7 +178,7 @@ def run_plan(pb, pb_config)
         end
 
         puts
-        puts "Plan %s ran in %.2f seconds: %s" % [
+        puts "Playbook %s ran in %.2f seconds: %s" % [
           Util.colorize(:bold, configuration[:__playbook]),
           endtime - startime,
           Util.colorize(color, msg)

diff --git a/lib/mcollective/util/bolt_support/plan_runner.rb b/lib/mcollective/util/bolt_support/plan_runner.rb
@@ -56,7 +56,7 @@ def plan_signature
           with_script_compiler do |compiler|
             sig = compiler.plan_signature(@plan)
 
-            raise("Cannot find plan %s in %s" % [@plan, @modulepath.join(":")]) unless sig
+            raise("Cannot find playbook %s in %s" % [@plan, @modulepath.join(":")]) unless sig
 
             sig.params_type.elements.map do |elem|
               [elem.name, {