lib/ironfan/dsl/component.rb in ironfan-5.0.4 vs lib/ironfan/dsl/component.rb in ironfan-5.0.5

@@ -90,27 +90,27 @@
         end
       end
 
       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
 
         Chef::Log.debug("discovered #{announce_name} for #{cluster_name}: #{discovery}")
@@ -129,15 +129,11 @@
       def group_edge(cloud, group_1, method, group_2)
         cloud.security_group(group_1).send(method, group_2)
         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
 
     module Announcement
       include Gorillib::Builder