ironfan 5.0.4 → 5.0.5

data/VERSION

@@ -1 +1 @@
-5.0.4
+5.0.5

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "5.0.4"
+  s.version = "5.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-12-12"
+  s.date = "2013-12-18"
   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/ironfan/dsl/component.rb

@@ -92,23 +92,23 @@ module Ironfan
 
       def set_discovery compute, keys
         if server_cluster
-          wire_to(compute, full_server_cluster, facet_name, keys)
+          wire_to(compute, full_server_cluster, keys)
         else
           # I'm defanging automatic discovery for now.
           raise StandardError.new("must explicitly specify a server_cluster for discovery")
           # discover(announce_name) do |cluster_name, facet_name|
-          #   wire_to(compute, cluster_name, facet_name, keys)
+          #   wire_to(compute, [cluster_name, facet_name].join('-'), keys)
           # end
         end
       end
 
-      def wire_to(compute, cluster_name, facet_name, keys)
-        discovery = {discovers: keys.reverse.inject(cluster_name){|hsh,key| {key => hsh}}}
+      def wire_to(compute, full_server_cluster_v, keys)
+        discovery = {discovers: keys.reverse.inject(full_server_cluster_v){|hsh,key| {key => hsh}}}
         (compute.facet_role || compute.cluster_role).override_attributes(discovery)
 
         # FIXME: This is Ec2-specific and probably doesn't belong here.
         client_group_v = client_group(compute)
-        server_group_v = server_group(cluster_name, facet_name)
+        server_group_v = security_group(full_server_cluster_v)
 
         group_edge(compute.cloud(:ec2), client_group_v, :authorized_by_group, server_group_v)
         group_edge(compute.cloud(:ec2), client_group_v, :authorize_group,     server_group_v) if bidirectional
@@ -131,12 +131,8 @@ module Ironfan
         Chef::Log.debug("component.rb: allowing access from security group #{group_1} to #{group_2}")
       end
 
-      def security_group(cluster_name, facet_name)
-        facet_name ? [cluster_name, facet_name].join('-') : cluster_name
-      end
-
-      def server_group(cluster_name, facet_name)
-        security_group(cluster_name, facet_name)
+      def security_group(*target_components)
+        target_components.compact.join('-')
       end
     end
 

data/spec/ironfan/plugin_spec.rb

@@ -93,7 +93,6 @@ describe Ironfan::Dsl::Component do
           include Ironfan::Dsl::Component::Discovery    if not server_b
 
           if bidirectional and not server_b
-            STDERR.puts("defaulting #{name} to bidirectional")
             default_to_bidirectional
           end
 
@@ -116,6 +115,7 @@ describe Ironfan::Dsl::Component do
       make_plugin_pair(:bam)
       make_plugin_pair(:pow)
       make_plugin_pair(:zap, true)
+      make_plugin_pair(:bop)
 
       Ironfan.realm(:wap) do
         cloud(:ec2)
@@ -137,12 +137,26 @@ describe Ironfan::Dsl::Component do
         cluster(:bif) do
           zap_server
         end
+
+        cluster(:bam) do
+          facet(:wak) do
+            bop_client{ server_cluster :bop }
+          end
+        end
+
+        cluster(:bop) do
+          facet(:pow) do
+            bop_server
+          end
+        end
+
       end.resolve!
     end
 
     after(:each) do
-      [:BamServer, :BamClient, :PowServer,
-       :PowClient, :ZapClient, :ZapServer].each do |class_name|
+      [:BamServer, :BamClient, :PowServer, :PowClient,
+       :ZapClient, :ZapServer, :BopServer, :BopClient,
+       ].each do |class_name|
         Ironfan::Dsl::Component.send(:remove_const, class_name)
       end
     end
@@ -166,5 +180,11 @@ describe Ironfan::Dsl::Component do
     it 'does not configure extra security groups during bidirectional discovery' do
       Ironfan.realm(:wap).cluster(:baz).cloud(:ec2).security_groups.keys.should_not include('wap_bif')
     end
+
+    it 'correctly sets the server cluster even when the client and server facets differ' do
+      bam_wak_group = Ironfan.realm(:wap).cluster(:bam).facet(:wak).cloud(:ec2).security_group('wap_bam-wak')
+      bam_wak_group.group_authorized_by.should include('wap_bop')
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -410,7 +410,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -19121079596515349
+      hash: 484463336952963862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: