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

@@ -84,11 +84,11 @@
 
       (@_dependencies ||= []) << Gorillib::Builder
 
       module ClassMethods
         def default_to_bidirectional default=true
-          fields[:bidirectional].default = default
+          magic :bidirectional, :boolean, default: default
         end
       end
 
       def set_discovery compute, keys
         if server_cluster
@@ -107,14 +107,14 @@
         (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)
-        
-        group_edge(compute.cloud(:ec2), client_group_v, server_group_v)
-        group_edge(compute.cloud(:ec2), server_group_v, client_group_v) if bidirectional
 
+        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}")
       end
 
       protected
 
@@ -124,11 +124,11 @@
       
       def full_server_cluster
         "#{realm_name}_#{server_cluster}"
       end
 
-      def group_edge(cloud, group_1, group_2)
-        cloud.security_group(group_1).authorize_group(group_2)
+      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