ironfan 6.1.4 → 6.1.5

data/lib/ironfan/dsl/cluster.rb

@@ -46,6 +46,10 @@ module Ironfan
         name
       end
 
+      def full_cluster_name
+        full_name
+      end
+
       def full_name
         "#{realm_name}-#{name}"
       end

data/lib/ironfan/dsl/component.rb

@@ -110,7 +110,7 @@ module Ironfan
         discovery = {discovers: keys.reverse.inject(compute.realm_name){|hsh,key| {key => hsh}}}
         (compute.facet_role || compute.cluster_role).override_attributes(discovery)
 
-        client_group_v = compute.full_name
+        client_group_v = compute.full_cluster_name
         server_group_v = "#{realm_name}-#{server_cluster}"
 
         group_edge(compute, client_group_v, :authorized_by_group, server_group_v)

data/lib/ironfan/dsl/facet.rb

@@ -27,8 +27,12 @@ module Ironfan
         servers.to_a + components.to_a
       end
 
+      def full_cluster_name
+        "#{realm_name}-#{cluster_name}"
+      end
+
       def full_name
-        "#{realm_name}-#{cluster_name}-#{name}"
+        "#{full_cluster_name}-#{name}"
       end
     end
   end

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

@@ -209,8 +209,6 @@ module Ironfan
           server.security_group computer.server.realm_name
           realm_group = server.security_group cluster_name
           realm_group.authorized_by_group realm_group.name
-          facet_name = "#{computer.server.realm_name}-#{computer.server.cluster_name}-#{computer.server.facet_name}"
-          server.security_group facet_name
         end
 
         # Try an authorization, ignoring duplicates (this is easier than correlating).

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

@@ -192,8 +192,6 @@ module Ironfan
           server.security_group computer.server.realm_name
           realm_group = server.security_group cluster_name
           realm_group.authorized_by_group realm_group.name
-          facet_name = "#{computer.server.realm_name}-#{computer.server.cluster_name}-#{computer.server.facet_name}"
-          server.security_group facet_name
         end
 
         # Try an authorization, ignoring duplicates (this is easier than correlating).

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.1.4'
+  VERSION = '6.1.5'
 end

data/spec/ironfan/plugin_spec.rb

@@ -197,7 +197,7 @@ describe Ironfan::Dsl::Component do
     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).security_group('wap-bam-wak')
+      bam_wak_group = Ironfan.realm(:wap).cluster(:bam).facet(:wak).security_group('wap-bam')
       bam_wak_group.group_authorized_by.should include('wap-bop')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 6.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -318,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -810128276045703285
+      hash: -1549978331265274060
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,10 +327,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -810128276045703285
+      hash: -1549978331265274060
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Infochimps' lightweight cloud orchestration toolkit, built on top of Chef.