puppet-pssh 0.3.1 → 0.3.2

data/lib/puppet-pssh.rb

@@ -9,7 +9,50 @@ require 'pp'
 
 module PuppetPSSH
 
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
+
+  class PuppetDB
+   
+    def initialize(host = 'puppet', port = '8080', use_ssl = false)
+      @host = host
+      @port = port
+      @use_ssl = use_ssl
+    end 
+    
+    def url 
+      "#{@use_ssl ? 'https' : 'http'}://#{@host}:#{@port}/"
+    end
+
+    def get_nodes_from_query(query)
+      target_url = "#{url}nodes?query=#{query}"
+      Log.debug "Puppet master host: #{@host}"
+      Log.debug "Puppet master url: #{target_url}"
+
+      nodes = []
+      begin
+        out = Excon.get target_url
+        JSON.parse(out.body).each do |n| 
+          nodes << n 
+        end
+      rescue TypeError => e
+        raise Exception.new "Error retrieving node list from master host: #{@host}"
+      rescue Excon::Errors::SocketError => e
+        raise Exception.new "Could not connect to the puppet master host: #{@host}"
+      end
+      nodes
+    end
+    
+    def deactivated_nodes
+      query = URI.encode '["=", ["node", "active"], false]'
+      get_nodes_from_query query
+    end
+
+    def active_nodes
+      query = URI.encode '["=", ["node", "active"], true]'
+      get_nodes_from_query query
+    end
+
+  end
 
   if !defined? Log or Log.nil?
     Log = Logger.new($stdout)
@@ -147,6 +190,7 @@ module PuppetPSSH
 
     parameter "COMMAND ...", "Command to run"
     option "--nameserver", "DNS_SERVER", "Resolve node name using the given nameserver"
+    option "--use-ipaddress-fact", :flag, "Use node's ipaddress fact as the target IP"
     option "--pssh-path", "PSSH_PATH", "Parallel-ssh command path", :default => '/usr/bin/parallel-ssh'
     option "--hostlist-path", "HOSTLIST_PATH", "Save host list to path", :default => '/tmp/puppet-pssh-run-hostlist'
     option ["-H", "--hostlist-path"], "HOSTLIST_PATH", "Save host list to path", :default => '/tmp/puppet-pssh-run-hostlist'
@@ -189,12 +233,14 @@ module PuppetPSSH
         # 
         # Optionally resolve names using specific DNS server
         #
-        unless nameserver.nil?
+        if !nameserver.nil?
           require 'net/dns'
           Log.info "DNS Server: #{nameserver}"
           Log.info "Resolving node names... (may take a while)"
           res = Net::DNS::Resolver.new
           res.nameservers = nameserver
+        elsif use_ipaddress_fact?
+          Log.info "Using node ipaddress fact to connect to the node..."
         end
         #
         File.open hostlist_path, 'w' do |f|
@@ -202,8 +248,19 @@ module PuppetPSSH
             address = i
             # try to resolve before writing the list
             Log.debug "Adding #{address}"
-            unless nameserver.nil?
+            if !nameserver.nil?
               address = res.query(i).answer.first.address rescue next
+            elsif use_ipaddress_fact?
+              value = JSON.parse(
+                Excon.get(master_url + "facts/#{i}").body
+              )['facts']['ipaddress']
+              if value
+                address = value
+              else
+                Log.warn "Node #{i} does not have ipaddress fact. Using FQDN."
+                address = i
+              end
+            else
             end
             f.puts "#{address}"
           end
@@ -241,10 +298,31 @@ module PuppetPSSH
     end
   end
 
+  class CountNodes < Clamp::Command
+    option ["-p", "--puppetdb-host"], "PUPPETDB_HOST", "PuppetDB host",     :default => 'puppet'
+    option ["-P", "--puppetdb-port"], "PUPPETMASTER_PORT", "PuppetDB port", :default => '8080'
+    option "--debug", :flag, "Print debugging output", :default => false do |o|
+      Log.level = Logger::DEBUG 
+    end
+
+    def execute
+      pdb = PuppetDB.new puppetdb_host, puppetdb_port
+      active = pdb.active_nodes.size
+      deactivated = pdb.deactivated_nodes.size
+      total = active + deactivated
+      Log.info "Node population"
+      Log.info "Active nodes:   #{active}"
+      Log.info "Inactive nodes: #{deactivated}"
+      Log.info "Total:          #{total}"
+    end
+
+  end
+
   class Driver < Clamp::Command
 
     subcommand "run", "Run an arbitrary command against the nodes", Run
     subcommand "list", "List registered nodes", List 
+    subcommand "count-nodes", "Node population", CountNodes 
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-pssh
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored