loe-iclassify-interface 1.0.12 → 1.0.13

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = %Q{Module for interfacing with iclassify.}
     gem.email = "andrew@andrewloe.com"
     gem.homepage = "http://github.com/loe/iclassify-interface"
-    gem.authors = ["W. Andrew Loe III"]
+    gem.authors = ["Adam Jacob", "W. Andrew Loe III"]
     gem.add_dependency("uuidtools", '>= 2.0.0')
     gem.add_dependency("rake", ">= 0.8.3")
     gem.add_dependency("launchy")
@@ -53,7 +53,7 @@ Rake::RDocTask.new do |rdoc|
   end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "icagent2 #{version}"
+  rdoc.title = "iclassify-interface #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-1.0.12
+1.0.13

data/bin/icpuppet

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+#
+#  iClassify - A node classification service. 
+#  Copyright (C) 2007 HJK Solutions and Adam Jacob (<adam@hjksolutions.com>)
+# 
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+# 
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+# 
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#  Puppet node integration; turns an IClassify node into a puppet node.
+#
+
+require 'rubygems'
+require File.dirname(__FILE__) + '/../lib/iclassify-interface'
+require 'optparse'
+require 'highline/import'
+
+config = {}
+args = ARGV
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [-s server] hostname"
+  opts.on("-s SERVER", "--server", "iClassify Server URL") do |s|
+    config[:server] = s
+  end
+  opts.on("-u user", "--user user", "User to authenticate with, defaults to USER env variable") do |u|
+    config[:user] = u
+  end
+  opts.on("-p passwd", "--passwd passwd", "Password to authenticate with") do |p|
+    config[:passwd] = p
+  end
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end
+opts.parse!(args)
+
+unless args.length == 1
+  puts "You must supply a hostname or fqdn.  You supplied: "
+  puts args.join(" ")
+  puts opts.help
+  exit 1
+end
+
+unless config[:passwd]
+  config[:passwd] = HighLine.ask("Password: ") { |q| q.echo = "*" }
+end
+
+unless config[:user] && config[:passwd]
+  puts "You must provide a username and password."
+  puts opts.help
+  exit 1
+end
+
+
+hostname = args[0]
+
+client = IClassify::Client.new(config[:server], config[:user], config[:passwd])
+begin
+  results = client.search("hostname:#{hostname} OR fqdn:#{hostname}")
+rescue SocketError
+  $stderr.puts("Error: Could not connect to server.")
+  exit 1
+end
+
+if results.length > 1
+  STDERR.puts "Hostname #{hostname} has more than one node definition!"
+  exit 10
+end
+# FIXME: This should go away when real support for parents/children shows up.
+base_node = client.search("description:\"Base node\"")
+if base_node.length == 1
+  base_node[0].tags.each do |tag|
+    results[0].tags << tag unless results[0].tags.detect { |t| t == tag }
+  end
+end
+results.each do |node|
+  puts node.to_puppet
+end
+exit 0

data/bin/icsearch

@@ -26,8 +26,6 @@ require 'optparse'
 require 'highline/import'
 
 config = {
-  :server => 'https://iclassify',
-  :user   => ENV.has_key?('USER') ? ENV['USER'] : 'puppet',
   :only => nil,
   :quiet => nil
 }

data/iclassify-interface.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{iclassify-interface}
-  s.version = "1.0.12"
+  s.version = "1.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["W. Andrew Loe III"]
-  s.date = %q{2009-07-29}
+  s.authors = ["Adam Jacob", "W. Andrew Loe III"]
+  s.date = %q{2009-08-12}
   s.email = %q{andrew@andrewloe.com}
-  s.executables = ["icagent", "icsearch", "icwatcher"]
+  s.executables = ["icagent", "icpuppet", "icsearch", "icwatcher"]
   s.extra_rdoc_files = [
     "README"
   ]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/icagent",
+     "bin/icpuppet",
      "bin/icsearch",
      "bin/icwatcher",
      "iclassify-interface.gemspec",

data/recipes/02_ec2.rb

@@ -1,27 +1,44 @@
 require 'net/http'
 
-ec2 = false
-domain = attrib?('domain')
-ec2 = true if domain =~ /(\.amazonaws.com|compute-1.internal)$/
-
-if ec2
-  replace_attrib("ec2", "true") 
-else
-  replace_attrib("ec2", "false")
-end
-
-def get_from_ec2(thing="/")
-  base_url = "http://169.254.169.254/latest/meta-data" + thing
+def get_from_ec2(key = '')
+  base_url = "http://instance-data.ec2.internal/latest/meta-data/" + key
   url = URI.parse(base_url)
   req = Net::HTTP::Get.new(url.path)
-  res = Net::HTTP.start(url.host, url.port) {|http|
+  res = Net::HTTP.start(url.host, url.port) do |http|
     http.request(req)
-  }
+  end
+  
   res.body
 end
 
-if ec2
-  get_from_ec2.split("\n").each do |key|
-    add_attrib("ec2-#{key}", get_from_ec2("/#{key}"))
+def get_keys(key = '')
+  keys = get_from_ec2(key).split("\n")
+  
+  keys.inject([]) do |accum, k|
+    if k =~ /\/$/
+      get_keys(key + k).each do |k|
+        accum << k
+      end
+      
+      accum
+    elsif k =~ /=/
+      get_keys(key + $` + '/').each do |k|
+        accum << k
+      end
+      
+      accum
+    else
+      accum << key + k
+      
+      accum
+    end
   end
 end
+
+if attrib?('domain') =~ /(\.amazonaws.com|compute-1.internal|ec2.internal)$/
+  replace_attrib("ec2", "true")
+
+  get_keys.each do |key|
+    replace_attrib("ec2-#{key.gsub('/', '-')}", get_from_ec2("#{key}"))
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: loe-iclassify-interface
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors: 
+- Adam Jacob
 - W. Andrew Loe III
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2009-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +57,7 @@ description:
 email: andrew@andrewloe.com
 executables: 
 - icagent
+- icpuppet
 - icsearch
 - icwatcher
 extensions: []
@@ -68,6 +70,7 @@ files:
 - Rakefile
 - VERSION
 - bin/icagent
+- bin/icpuppet
 - bin/icsearch
 - bin/icwatcher
 - iclassify-interface.gemspec