ironfan 4.3.0 → 4.3.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.3.1:
+* Correcting fullname to full_name for DSL::Compute children (this allows security_group(full_name) inside of facets)
+
 # v4.3.0: VPC support
 * Launch instances in pre-existing VPC and subnet, with group support
 * Refactored security_group to handle VPC groups (which must use ID, not name)

data/VERSION

@@ -1 +1 @@
-4.3.0
+4.3.1

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.3.0"
+  s.version = "4.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-10-02"
+  s.date = "2012-10-03"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/chef/knife/ironfan_knife_common.rb

@@ -134,7 +134,7 @@ module Ironfan
       bootstrap.config[:identity_file]  = config[:identity_file]  || computer.ssh_identity_file
       bootstrap.config[:distro]         = config[:distro]         || computer.bootstrap_distro
       bootstrap.config[:use_sudo]       = true unless config[:use_sudo] == false
-      bootstrap.config[:chef_node_name] = server.fullname
+      bootstrap.config[:chef_node_name] = server.full_name
       bootstrap.config[:client_key]     = ( computer.client.private_key rescue nil )
       #
       bootstrap

data/lib/ironfan/broker/computer.rb

@@ -25,7 +25,7 @@ module Ironfan
       end
 
       def name
-        return server.fullname  if server?
+        return server.full_name if server?
         return @name            if @name
         "unnamed:#{object_id}"
       end

data/lib/ironfan/dsl/cluster.rb

@@ -11,7 +11,7 @@ module Ironfan
 
       # Utility method to reference all servers from constituent facets
       def servers
-        result = Gorillib::ModelCollection.new(:item_type => Ironfan::Dsl::Server, :key_method => :fullname)
+        result = Gorillib::ModelCollection.new(:item_type => Ironfan::Dsl::Server, :key_method => :full_name)
         facets.each {|f| f.servers.each {|s| result << s} }
         result
       end

data/lib/ironfan/dsl/compute.rb

@@ -32,7 +32,7 @@ module Ironfan
         super
       end
 
-      def fullname()    name;   end
+      def full_name()   name;   end
 
       # Add the given role/recipe to the run list. You can specify placement of
       #   `:first`, `:normal` (or nil) or `:last`; the final runlist is assembled

data/lib/ironfan/dsl/facet.rb

@@ -9,12 +9,12 @@ module Ironfan
       def initialize(attrs={},&block)
         self.cluster_name       = attrs[:owner].name unless attrs[:owner].nil?
         self.name               = attrs[:name] unless attrs[:name].nil?
-        self.facet_role         Ironfan::Dsl::Role.new(:name => fullname.sub('-','_'))
+        self.facet_role         Ironfan::Dsl::Role.new(:name => full_name.sub('-','_'))
         super
         for i in 0 .. instances-1; server(i); end
       end
 
-      def fullname()            "#{cluster_name}-#{name}";      end
+      def full_name()           "#{cluster_name}-#{name}";      end
 
     end
 

data/lib/ironfan/dsl/server.rb

@@ -16,7 +16,7 @@ module Ironfan
         super
       end
 
-      def fullname()            "#{cluster_name}-#{facet_name}-#{name}";        end
+      def full_name()           "#{cluster_name}-#{facet_name}-#{name}";        end
       def index()               name.to_i;                                      end
       def implied_volumes()     selected_cloud.implied_volumes;                 end
 

data/lib/ironfan/provider/chef/client.rb

@@ -26,7 +26,7 @@ module Ironfan
         def self.shared?()              false;  end
         def self.multiple?()            false;  end
         def self.resource_type()        :client;                        end
-        def self.expected_ids(computer) [computer.server.fullname];     end
+        def self.expected_ids(computer) [computer.server.full_name];     end
 
         def self.key_dir
           Chef::Config.client_key_dir || "/tmp/#{ENV['USER']}-client_keys"
@@ -59,7 +59,7 @@ module Ironfan
         def self.create!(computer)
           return if computer.client?
           client = Client.new
-          client.name         computer.server.fullname
+          client.name         computer.server.full_name
           client.admin        false
 
           params = {:name => client.name, :admin => client.admin, :private_key => true }

data/lib/ironfan/provider/chef/node.rb

@@ -39,7 +39,7 @@ module Ironfan
         def self.multiple?()            false;  end
 #         def self.resource_type()        self;   end
         def self.resource_type()        :node;   end
-        def self.expected_ids(computer) [computer.server.fullname];   end
+        def self.expected_ids(computer) [computer.server.full_name];   end
 
         def to_display(style,values={})
           values["Chef?"] =     adaptee.nil? ? "no" : "yes"
@@ -113,7 +113,7 @@ module Ironfan
         def self.create!(computer)
           return if computer.node?
           node = Node.new
-          node.name           computer.server.fullname
+          node.name           computer.server.full_name
           node.create!        computer
           computer.node =     node
           remember            node

data/lib/ironfan/provider/ec2/ebs_volume.rb

@@ -27,7 +27,7 @@ module Ironfan
         def self.expected_ids(computer)
           computer.server.volumes.values.map do |volume|
             saved = computer.node[:volumes][volume.name][:volume_id] rescue nil
-            ebs_name = "#{computer.server.fullname}-#{volume.name}"
+            ebs_name = "#{computer.server.full_name}-#{volume.name}"
             [ volume.volume_id, saved, ebs_name ]
           end.flatten.compact
         end

data/lib/ironfan/provider/ec2/machine.rb

@@ -38,7 +38,7 @@ module Ironfan
         def self.multiple?()    false;  end
 #        def self.resource_type()        Ironfan::IaasProvider::Machine;   end
         def self.resource_type()        :machine;   end
-        def self.expected_ids(computer) [computer.server.fullname];   end
+        def self.expected_ids(computer) [computer.server.full_name];   end
 
         def name
           return id if tags.empty?

data/spec/chef/cluster_bootstrap_spec.rb

@@ -46,6 +46,6 @@ describe Chef::Knife::ClusterBootstrap do
 
   # it 'loads computers from json' do
   #   computers.length.should == 2
-  #   computers.first.server.fullname.should == 'gunbai-hub-0'
+  #   computers.first.server.full_name.should == 'gunbai-hub-0'
   # end
 end

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-02 00:00:00 Z
+date: 2012-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -131746219185203248
+      hash: -2956161478008164858
       segments: 
       - 0
       version: "0"