ironfan 4.2.2 → 4.2.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v4.2.3
+* Making aws_account_id unnecessary for security groups (its not needed by newer Fog)
+* Removed redundant cloud_provider.rb (thanks @nickmarden)
+* Use Chef::Node-friendly semantics for chef_environment (thanks @nickmarden)
+
 # v4.2.2: @mrflip rocks the house
 * Terminated machines are not bogus (fixes #165)
 * Ignore deleting, deleted, or errored volumes in discovery

data/VERSION

@@ -1 +1 @@
-4.2.2
+4.2.3

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.2.2"
+  s.version = "4.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-10-01"
+  s.date = "2012-10-02"
   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 = [
@@ -88,7 +88,6 @@ Gem::Specification.new do |s|
     "spec/fixtures/gunbai.rb",
     "spec/fixtures/gunbai_slice.json",
     "spec/ironfan/cluster_spec.rb",
-    "spec/ironfan/ec2/cloud_provider.rb",
     "spec/ironfan/ec2/cloud_provider_spec.rb",
     "spec/ironfan/ec2/security_group_spec.rb",
     "spec/spec_helper.rb",
@@ -101,7 +100,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
   s.summary = "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.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/ironfan/ec2/cloud_provider.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
+  s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

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

@@ -6,7 +6,7 @@ module Ironfan
         delegate :[], :[]=, :add_to_index, :apply_expansion_attributes,
             :attribute, :attribute=, :attribute?, :automatic_attrs,
             :automatic_attrs=, :cdb_destroy, :cdb_save, :chef_environment,
-            :chef_environment=, :chef_server_rest, :class_from_file,
+            :chef_server_rest, :class_from_file,
             :construct_attributes, :consume_attributes,
             :consume_external_attrs, :consume_run_list, :cookbook_collection,
             :cookbook_collection=, :couchdb, :couchdb=, :couchdb_id,
@@ -64,9 +64,8 @@ module Ironfan
         def prepare_from(computer)
           organization =                Chef::Config.organization
           normal[:organization] =       organization unless organization.nil?
-
           server =                      computer.server
-          chef_environment =            server.environment
+          chef_environment(server.environment.to_s)
           run_list.instance_eval        { @run_list_items = server.run_list }
           normal[:cluster_name] =       server.cluster_name
           normal[:facet_name] =         server.facet_name

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

@@ -95,14 +95,12 @@ module Ironfan
           dsl_groups.each do |dsl_group|
             dsl_group.group_authorized.each do |other_group|
               Ironfan.step(dsl_group.name, "  ensuring access from #{other_group}", :blue)
-              options = {:group => "#{Ec2.aws_account_id}:#{other_group}"}
-              safely_authorize(dsl_group.name,1..65535,options)
+              safely_authorize(dsl_group.name, 1..65535, :group => other_group)
             end
 
             dsl_group.group_authorized_by.each do |other_group|
               Ironfan.step(dsl_group.name, "  ensuring access to #{other_group}", :blue)
-              options = {:group => "#{Ec2.aws_account_id}:#{dsl_group.name}"}
-              safely_authorize(other_group,1..65535,options)
+              safely_authorize(other_group, 1..65535, :group => dsl_group.name)
             end
 
             dsl_group.range_authorizations.each do |range_auth|

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-01 00:00:00 Z
+date: 2012-10-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -214,7 +214,6 @@ files:
 - spec/fixtures/gunbai.rb
 - spec/fixtures/gunbai_slice.json
 - spec/ironfan/cluster_spec.rb
-- spec/ironfan/ec2/cloud_provider.rb
 - spec/ironfan/ec2/cloud_provider_spec.rb
 - spec/ironfan/ec2/security_group_spec.rb
 - spec/spec_helper.rb
@@ -234,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3459217144726680577
+      hash: 4307969691364696392
       segments: 
       - 0
       version: "0"
@@ -256,7 +255,6 @@ test_files:
 - spec/ironfan/cluster_spec.rb
 - spec/ironfan/ec2/cloud_provider_spec.rb
 - spec/ironfan/ec2/security_group_spec.rb
-- spec/ironfan/ec2/cloud_provider.rb
 - spec/chef/cluster_bootstrap_spec.rb
 - spec/fixtures/gunbai_slice.json
 - spec/fixtures/gunbai.rb

data/spec/ironfan/ec2/cloud_provider.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-require 'ironfan'
-
-describe Ironfan::Dsl::Cluster do
-  let (:cluster) do
-    Ironfan.cluster "sparky" do
-
-      cloud(:ec2) do
-        security_group(:ssh).authorize_port_range 22..22
-        flavor 't1.micro'
-      end
-
-      facet :web do
-        instances 3
-      end
-
-    end
-  end
-
-  describe 'web facet server resolution' do
-    before { @facet = cluster.facets.values.first }
-    subject { @facet }
-    its(:name) { should eql "web" }
-
-    it 'should have the right number of servers' do
-      @facet.servers.length.should == 3
-    end
-
-    it 'should have one cloud provider, EC2' do
-      @facet.servers[0].clouds.keys.should == [ :ec2 ]
-    end
-  end
-
-end