ironfan 6.0.1 → 6.0.3

data/lib/ironfan/dsl/cluster.rb

@@ -22,9 +22,9 @@ module Ironfan
       
       def initialize(attrs = {}, &blk)
         super
-        self.cluster_role  Ironfan::Dsl::Role.new(name: "#{attrs[:name]}-cluster")
         self.realm_name    attrs[:owner].name          unless attrs[:owner].nil?
         self.cluster_names attrs[:owner].cluster_names unless attrs[:owner].nil?
+        self.cluster_role  Ironfan::Dsl::Role.new(name: Compute.cluster_role_name(realm_name, cluster_name))
       end
 
       # Utility method to reference all servers from constituent facets
@@ -41,6 +41,10 @@ module Ironfan
       def cluster_name
         name
       end
+
+      def full_name
+        "#{realm_name}-#{name}"
+      end
     end
   end
 end

data/lib/ironfan/dsl/component.rb

@@ -96,7 +96,7 @@ module Ironfan
 
       def set_discovery(compute, keys)
         if server_cluster
-          wire_to(compute, full_server_cluster, keys)
+          wire_to(compute, keys)
         else
           # I'm defanging automatic discovery for now.
           raise StandardError.new("must explicitly specify a server_cluster for discovery")
@@ -106,37 +106,29 @@ module Ironfan
         end
       end
 
-      def wire_to(compute, full_server_cluster_v, keys)
-        discovery = {discovers: keys.reverse.inject(full_server_cluster_v){|hsh,key| {key => hsh}}}
+      def wire_to(compute, keys)
+        discovery = {discovers: keys.reverse.inject(compute.realm_name){|hsh,key| {key => hsh}}}
         (compute.facet_role || compute.cluster_role).override_attributes(discovery)
 
-        client_group_v = client_group(compute)
-        server_group_v = security_group(full_server_cluster_v)
+        client_group_v = compute.full_name
+        server_group_v = "#{realm_name}-#{server_cluster}"
 
         group_edge(compute, client_group_v, :authorized_by_group, server_group_v)
-        group_edge(compute, client_group_v, :authorize_group,     server_group_v) if bidirectional
+        Chef::Log.debug("#{client_group_v} authorized by #{server_group_v}")
+        if bidirectional
+          group_edge(compute, client_group_v, :authorize_group,     server_group_v) 
+          Chef::Log.debug("#{client_group_v} authorizes #{server_group_v}")
+        end
 
         Chef::Log.debug("discovered #{announce_name} for #{cluster_name}: #{discovery}")
       end
 
       protected
 
-      def client_group(compute)
-        security_group(compute.cluster_name, (compute.name if compute.is_a?(Facet)))
-      end
-      
-      def full_server_cluster
-        server_cluster
-      end
-
       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(*target_components)
-        target_components.compact.join('-')
-      end
     end
 
     module Announcement

data/lib/ironfan/dsl/compute.rb

@@ -96,6 +96,14 @@ module Ironfan
         clouds.values.first
       end
 
+      def self.cluster_role_name realm_name, cluster_name
+        "#{realm_name}-#{cluster_name}-cluster"
+      end
+
+      def self.facet_role_name realm_name, cluster_name, facet_name
+        "#{realm_name}-#{cluster_name}-#{facet_name}-facet"
+      end
+
     protected
 
       def add_to_run_list(item, placement=nil)

data/lib/ironfan/dsl/facet.rb

@@ -18,7 +18,7 @@ module Ironfan
         self.realm_name     attrs[:owner].realm_name    unless attrs[:owner].nil?
         self.cluster_name = attrs[:owner].cluster_name  unless attrs[:owner].nil?
         self.name         = attrs[:name]                unless attrs[:name].nil?
-        self.facet_role     Ironfan::Dsl::Role.new(name: "#{full_name}-facet")
+        self.facet_role     Ironfan::Dsl::Role.new(name: Compute.facet_role_name(realm_name, cluster_name, name))
         super
         (0..instances - 1).each{ |idx| server idx }
       end
@@ -28,7 +28,7 @@ module Ironfan
       end
 
       def full_name
-        "#{cluster_name}-#{name}"
+        "#{realm_name}-#{cluster_name}-#{name}"
       end
     end
   end

data/lib/ironfan/dsl/server.rb

@@ -226,8 +226,8 @@ module Ironfan
           self.cluster_name =   attrs[:owner].cluster_name
           self.facet_name =     attrs[:owner].name
 
-          self.role     "#{self.cluster_name}-cluster", :last
-          self.role     attrs[:owner].facet_role.name,  :last
+          self.role     Compute.cluster_role_name(realm_name, cluster_name), :last
+          self.role     Compute.facet_role_name(realm_name, cluster_name, facet_name), :last
         end
         super
       end

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

@@ -4,7 +4,7 @@ module Ironfan
 
       class SecurityGroup < Ironfan::Provider::Resource
 
-        WIDE_OPEN = Range.new(1,65535)
+        WIDE_OPEN = (-1..-1)
 
         delegate :_dump, :authorize_group_and_owner, :authorize_port_range,
             :collection, :collection=, :connection, :connection=, :description,
@@ -209,24 +209,23 @@ module Ironfan
         # Try an authorization, ignoring duplicates (this is easier than correlating).
         # Do so for both TCP and UDP, unless only one is specified
         def self.safely_authorize(fog_group,range,options)
+
           if options[:group_alias]
-            owner, group = options[:group_alias].split(/\//)
-            self.patiently(fog_group.name, Fog::Compute::AWS::Error, :ignore => Proc.new { |e| e.message =~ /InvalidPermission\.Duplicate/ }) do
-              Ec2.connection.authorize_security_group_ingress(
-                'GroupName'                   => fog_group.name,
-                'SourceSecurityGroupName'     => group,
-                'SourceSecurityGroupOwnerId'  => owner
-              )
-            end
+            owner, group = options.delete(:group_alias).split(/\//)
+            Chef::Log.debug("authorizing group alias #{options[:group_alias].inspect} to group #{fog_group.name}")
+            group_id = Ec2.connection.security_groups.get(group).group_id
+            safely_authorize(fog_group, range, options.merge(group: group_id))
           elsif options[:ip_protocol]
+            Chef::Log.debug("authorizing to #{fog_group.name} with options #{options.inspect}")
             self.patiently(fog_group.name, Fog::Compute::AWS::Error, :ignore => Proc.new { |e| e.message =~ /InvalidPermission\.Duplicate/ }) do
               fog_group.authorize_port_range(range,options)
             end
           else
-            safely_authorize(fog_group,range,options.merge(:ip_protocol => 'tcp'))
-            safely_authorize(fog_group,range,options.merge(:ip_protocol => 'udp'))
-            safely_authorize(fog_group,Range.new(-1,-1),options.merge(:ip_protocol => 'icmp')) if(range == WIDE_OPEN)
-            return
+            Chef::Log.debug([
+                "didn't receive ip_protocol for authorization to #{fog_group.name} ",
+                "with options #{options.inspect}. assuming all protocols"
+              ].join)
+            safely_authorize(fog_group,range,options.merge(:ip_protocol => -1))
           end
         end
       end

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.0.1'
+  VERSION = '6.0.3'
 end

data/spec/ironfan/plugin_spec.rb

@@ -177,28 +177,28 @@ describe Ironfan::Dsl::Component do
     end
 
     it 'configures the correct security groups during discovery' do
-      foo_group = Ironfan.realm(:wap).cluster(:foo).security_group('foo')
-      bar_group = Ironfan.realm(:wap).cluster(:bar).security_group('bar')
+      foo_group = Ironfan.realm(:wap).cluster(:foo).security_group('wap-foo')
+      bar_group = Ironfan.realm(:wap).cluster(:bar).security_group('wap-bar')
 
-      foo_group.group_authorized_by.should include('bar')
-      bar_group.group_authorized_by.should include('foo')
+      foo_group.group_authorized_by.should include('wap-bar')
+      bar_group.group_authorized_by.should include('wap-foo')
     end
 
     it 'configures the correct security groups during bidirectional discovery' do
-      baz_group = Ironfan.realm(:wap).cluster(:baz).security_group('baz')
-      bif_group = Ironfan.realm(:wap).cluster(:bif).security_group('bif')
+      baz_group = Ironfan.realm(:wap).cluster(:baz).security_group('wap-baz')
+      bif_group = Ironfan.realm(:wap).cluster(:bif).security_group('wap-bif')
 
-      baz_group.group_authorized_by.should include('bif')
-      baz_group.group_authorized.should    include('bif')
+      baz_group.group_authorized_by.should include('wap-bif')
+      baz_group.group_authorized.should    include('wap-bif')
     end
 
     it 'does not configure extra security groups during bidirectional discovery' do
-      Ironfan.realm(:wap).cluster(:baz).security_groups.keys.should_not include('wap_bif')
+      Ironfan.realm(:wap).cluster(:baz).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).security_group('bam-wak')
-      bam_wak_group.group_authorized_by.should include('bop')
+      bam_wak_group = Ironfan.realm(:wap).cluster(:bam).facet(:wak).security_group('wap-bam-wak')
+      bam_wak_group.group_authorized_by.should include('wap-bop')
     end
 
   end

data/spec/ironfan/realm_spec.rb

@@ -120,7 +120,7 @@ describe Ironfan::Dsl::Realm do
   it 'should create clusters with attributes correctly applied' do    
     manifest.cluster_override_attributes.should == {a: 1}
     manifest.facet_override_attributes.should == {b: 1}
-    manifest.run_list.should == %w[role[blah] role[bar-cluster] role[bar-baz-facet]]
+    manifest.run_list.should == %w[role[blah] role[foo-bar-cluster] role[foo-bar-baz-facet]]
   end
 
   it 'should create clusters with the correct ssh user' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -169,7 +169,6 @@ files:
 - CHANGELOG.md
 - ELB.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.md
 - NOTES-REALM.md
@@ -319,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -797623552382133081
+      hash: 1692087169834386324
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -328,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -797623552382133081
+      hash: 1692087169834386324
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/Gemfile.lock

@@ -1,193 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ironfan (6.0.1)
-      chef (= 10.30.4)
-      diff-lcs (= 1.2.5)
-      excon (= 0.21.0)
-      fog (= 1.10.1)
-      formatador (= 0.2.4)
-      gorillib (= 0.5.0)
-      json (= 1.5.4)
-      rbvmomi (= 1.8.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    archive-tar-minitar (0.5.2)
-    builder (3.2.2)
-    bunny (0.7.9)
-    chef (10.30.4)
-      bunny (>= 0.6.0, < 0.8.0)
-      erubis
-      highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
-      mime-types (~> 1.16)
-      mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.1)
-      mixlib-config (~> 1.1, >= 1.1.2)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.3)
-      moneta (< 0.7.0)
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0, < 7.0.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      treetop (~> 1.4.9)
-      uuidtools
-      yajl-ruby (~> 1.1)
-    chef-zero (1.5.1)
-      hashie (~> 2.0)
-      json
-      mixlib-log (~> 1.3)
-      moneta (< 0.7.0)
-      puma (~> 1.6)
-    coderay (1.0.9)
-    columnize (0.3.6)
-    configliere (0.4.18)
-      highline (>= 1.5.2)
-      multi_json (>= 1.1)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    excon (0.21.0)
-    ffi (1.9.0)
-    fog (1.10.1)
-      builder
-      excon (~> 0.20)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-    formatador (0.2.4)
-    gorillib (0.5.0)
-      configliere (>= 0.4.13)
-      json
-      multi_json (>= 1.1)
-    guard (1.8.1)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (3.0.2)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    guard-yard (2.1.0)
-      guard (>= 1.1.0)
-      yard (>= 0.7.0)
-    hashie (2.0.5)
-    highline (1.6.21)
-    ipaddress (0.8.0)
-    json (1.5.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    listen (1.2.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.3)
-    method_source (0.8.1)
-    mime-types (1.25.1)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.4.0)
-    mixlib-config (1.1.2)
-    mixlib-log (1.6.0)
-    mixlib-shellout (1.3.0)
-    moneta (0.6.0)
-    multi_json (1.8.2)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    nokogiri (1.5.11)
-    ohai (6.20.0)
-      ipaddress
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    oj (2.1.2)
-    polyglot (0.3.4)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    puma (1.6.3)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rbvmomi (1.8.1)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    redcarpet (2.3.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby-hmac (0.4.0)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    ruby_gntp (0.3.4)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.5)
-    systemu (2.5.2)
-    thor (0.18.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    trollop (2.0)
-    uuidtools (2.1.4)
-    yajl-ruby (1.2.0)
-    yard (0.8.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0)
-  chef-zero
-  guard (~> 1)
-  guard-rspec
-  guard-yard
-  ironfan!
-  oj (>= 1.2)
-  rake
-  redcarpet (>= 2.1)
-  rspec (~> 2.8)
-  ruby-debug19
-  ruby_gntp
-  simplecov (>= 0.5)
-  yard (>= 0.7)