summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@puppetlabs.com>2011-03-02 17:19:36 -0800
committerLuke Kanies <luke@puppetlabs.com>2011-03-02 17:19:36 -0800
commit63263a41ab361985845ef514a3d1247a41f46475 (patch)
treef9d6eb160e4b05f43ccac67f497dd7a906085838 /lib
parent23064bb601622f8a0efaf47c66a9fefec6e62f95 (diff)
downloadpuppet-63263a41ab361985845ef514a3d1247a41f46475.tar.gz
puppet-63263a41ab361985845ef514a3d1247a41f46475.tar.xz
puppet-63263a41ab361985845ef514a3d1247a41f46475.zip
Fixing #13 - showconfig moved to indirector
I renamed it to 'info', too. It only showed indirector-related info, so this makes sense. Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/interface.rb9
-rw-r--r--lib/puppet/interface/indirector.rb9
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/puppet/interface.rb b/lib/puppet/interface.rb
index 1dfb34cf3..476de8bbf 100644
--- a/lib/puppet/interface.rb
+++ b/lib/puppet/interface.rb
@@ -82,15 +82,6 @@ class Puppet::Interface
attr_accessor :type, :verb, :name, :arguments, :options
- # Print the configuration for the current terminus class
- action :showconfig do |*args|
- if t = indirection.terminus_class
- puts "Run mode #{Puppet.run_mode}: #{t}"
- else
- $stderr.puts "No default terminus class for run mode #{Puppet.run_mode}"
- end
- end
-
def initialize(name, options = {}, &block)
@name = name
diff --git a/lib/puppet/interface/indirector.rb b/lib/puppet/interface/indirector.rb
index f106db4b8..9c26cc37a 100644
--- a/lib/puppet/interface/indirector.rb
+++ b/lib/puppet/interface/indirector.rb
@@ -26,6 +26,15 @@ class Puppet::Interface::Indirector < Puppet::Interface
call_indirection_method(:search, *args)
end
+ # Print the configuration for the current terminus class
+ action :info do |*args|
+ if t = indirection.terminus_class
+ puts "Run mode '#{Puppet.run_mode.name}': #{t}"
+ else
+ $stderr.puts "No default terminus class for run mode '#{Puppet.run_mode.name}'"
+ end
+ end
+
attr_accessor :from
def indirection_name