puppet-rundeck-2013 0.0.10 → 0.0.11

data/README.rdoc

@@ -54,15 +54,27 @@ To use with RunDeck specify the target URL as the value of the `project.resource
 
    project.resources.url = http://localhost:8144
 
-Yo can also specify a required tag to filter the node list, to provide different project URLs based
+You can also specify a required tag to filter the node list, to provide different project URLs based
 on the same puppet server and puppet-rundeck instance:
 
    project.resources.url = http://localhost:8144/tag/production
 
+In the version puppet-rundeck-2013 you can also pass configuration flags for puppet-rundeck.
+
+- user=rundeck_ssh_username - to override SSH user for Rundeck
+- use_tags=0 - to avoid adding default tags puppet from puppetmaster
+- add_facts=fact1,fact2,fact3 - list of facter facts that will be added as tags for rundeck
+
+Examples:
+
+Add facts *fqdn* and *ipaddress* to list of tags, set SSH user to *root* and disable puppet-generated tags:
+curl http://127.0.0.1:8144/?add_facts=fqdn,ipaddress&user=root&use_tags=0
+
+
 You can specify some configuration options:
 
 * -c or --config to override the default Puppet configuration file (defaults to `/etc/puppet/puppet.conf`)
-* -u or --username the user for RunDeck to SSH as, defaults to current user
+* -u or --username the user for RunDeck to SSH as, defaults to current user (you can override this value via URL, using *user* parameter)
 * -p or --port the port to start `puppet-rundeck` on, default to 8144
 
 == Credits
@@ -71,4 +83,4 @@ Original concept heavily stolen from Adam Jacob's chef-rundeck gem
 
 == Copyright
 
-Copyright (c) 2011 James Turnbull. See LICENSE for details.
+Copyright (c) 2011 James Turnbull. Few modifications by Aleksey Timohin. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/puppet-rundeck.rb

@@ -42,9 +42,15 @@ class PuppetRundeck < Sinatra::Base
     return input.to_s.to_xs
   end
 
-  def respond(required_tag=nil,uname=nil)
+  def respond(required_tag=nil,uname=nil,use_tags=nil,add_facts=nil)
     response['Content-Type'] = 'text/xml'
     response_xml = %Q(<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE project PUBLIC "-//DTO Labs Inc.//DTD Resources Document 1.0//EN" "project.dtd">\n<project>\n)
+
+      if use_tags.nil?
+        use_tags = '1'
+      end
+      should_use_tags = (! required_tag.nil?) || (use_tags == '1')
+
       # Fix for 2.6 to 2.7 indirection difference
       Puppet[:clientyamldir] = Puppet[:yamldir]
       if Puppet::Node.respond_to? :terminus_class
@@ -54,23 +60,56 @@ class PuppetRundeck < Sinatra::Base
         Puppet::Node.indirection.terminus_class = :yaml
         nodes = Puppet::Node.indirection.search("*")
       end
+
       nodes.each do |n|
-        if Puppet::Node::Facts.respond_to? :find
-          tags = Puppet::Resource::Catalog.find(n.name).tags
+        if should_use_tags
+          if Puppet::Node::Facts.respond_to? :find
+            tags = Puppet::Resource::Catalog.find(n.name).tags
+          else
+            tags = Puppet::Resource::Catalog.indirection.find(n.name).tags
+          end
         else
-          tags = Puppet::Resource::Catalog.indirection.find(n.name).tags
+          tags = nil
         end
+
         if ! required_tag.nil?
           next if ! tags.include? required_tag
         end
+
         facts = n.parameters
         os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
 
+        facts_string = nil
+
+        if !add_facts.nil?
+          add_facts.split(/,|;| +/).each { |fact_name|
+            fact = facts[fact_name]
+            if (!fact.nil?) and (!fact.empty?)
+              if facts_string.nil?
+                facts_string = fact
+              else
+                facts_string = [facts_string, fact].join(',')
+              end
+            end
+          }
+        end
+
         if uname == nil
           targetusername = PuppetRundeck.username
         else
           targetusername = uname
         end
+
+        if tags.nil?
+          tags_string = n.environment
+        else
+          tags_string = [n.environment, tags.join(',')].join(',')
+        end
+        
+        if !facts_string.nil?
+          tags_string = [tags_string,facts_string].join(',')
+        end
+
       response_xml << <<-EOH
 <node name="#{xml_escape(n.name)}"
       type="Node"
@@ -79,7 +118,7 @@ class PuppetRundeck < Sinatra::Base
       osFamily="#{xml_escape(os_family)}"
       osName="#{xml_escape(facts["operatingsystem"])}"
       osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
-      tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
+      tags="#{xml_escape(tags_string)}"
       username="#{xml_escape(targetusername)}"
       hostname="#{xml_escape(facts["ipaddress"] + ":" + PuppetRundeck.ssh_port.to_s)}"/>
 EOH
@@ -91,11 +130,11 @@ EOH
   require 'pp'
 
   get '/tag/:tag' do
-    respond(params[:tag], params["user"])
+    respond(params[:tag], params["user"], params["use_tags"], params["add_facts"])
   end
 
   get '/' do
-    respond (nil, params["user"])
+    respond(nil, params["user"], params["use_tags"], params["add_facts"])
   end
 
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-rundeck-2013
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  hash: 9
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - James Turnbull, Aleksejs Timohins
@@ -9,16 +15,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-28 00:00:00 Z
+date: 2013-10-03 00:00:00 +00:00
+default_executable: puppet-rundeck
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - &id004 
-      - ">="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -26,9 +36,15 @@ dependencies:
   name: builder
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :runtime
   version_requirements: *id002
@@ -36,20 +52,32 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: Provides a resource endpoint for RunDeck from a Puppet Server
 email: LazyDelphiBuilder@gmail.com
 executables: 
@@ -68,30 +96,40 @@ files:
 - spec/puppet-rundesk_spec.rb
 - spec/spec_helper.rb
 - bin/puppet-rundeck
+has_rdoc: true
 homepage: http://github.com/jamtur01/puppet-rundeck
 licenses: []
 
-metadata: {}
-
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Integrates Puppet with RunDeck
 test_files: 
 - spec/puppet-rundesk_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  data.tar.gz: 0979a2d10f17c3271961a4a4909a884b702da0a6
-  metadata.gz: 3727fe4c70a007bc5c7f01c7486a8c1f2a9d13c5
-SHA512: 
-  data.tar.gz: 3691c5cf9813d5b09c75a0c137c0d94aa554ac487b12dad737a44604e8ede6f84c267a66011c0e4366b47d4f43129012545f3e3922abc597868bfcfe8e4ff754
-  metadata.gz: 0a950e0102400254bb518fedfeace03b5b8e55ada9ef14950a3f87d2873ec3901eac26b336dfff76b8732bfde214d1a452542b46b334d480cf9846f7b37a7956