ironfan 4.5.2 → 4.6.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.6.0
+* Elastic IP attachment and SSH support (changes ec2.public_ip to ec2.elastic_ip for clarity - thanks @schade)
+* Expanded development dependencies, to allow avoiding bundler verbosity bug by rolling back to older version
+
 # v4.5.2:
 * 'knife cluster launch --bootstrap' should ensure that Chef::Config[:environment] is set, just as 'knife cluster bootstrap' does
 * Cleaning up knife commands to skip bogus servers (fixes #213)

data/Gemfile

@@ -6,7 +6,7 @@ gem 'formatador',    "~> 0.2"
 gem 'gorillib',      "~> 0.4.2"
 
 group :development do
-  gem 'bundler',     "~> 1.1"
+  gem 'bundler',     "~> 1.0"
   gem 'rake'
   gem 'rspec',       "~> 2.8"
   gem 'yard',        ">= 0.7"

data/VERSION

@@ -1 +1 @@
-4.5.2
+4.6.0

data/config/knife.bash

@@ -129,6 +129,11 @@ _knife() {
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
         return 0
         ;;
+    *knife_cluster_launch|*knife_cluster_show|*knife_cluster_edit)
+        _chef_completion_cache -c ${words[0]}_cluster "${words[0]} cluster list|awk '{ print $1 }'"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
     *knife_environment_show|*knife_environment_edit|*knife_environment_delete)
         _chef_completion_cache -c ${words[0]}_environments "${words[0]} environment list|${SED} -r -e 's/[\"\ ,]//g' -e '/[^0-9A-Za-z._-]+/d'"
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.5.2"
+  s.version = "4.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-11-27"
+  s.date = "2012-12-10"
   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 = [
@@ -159,7 +159,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<fog>, ["~> 1.2"])
       s.add_runtime_dependency(%q<formatador>, ["~> 0.2"])
       s.add_runtime_dependency(%q<gorillib>, ["~> 0.4.2"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8"])
       s.add_development_dependency(%q<yard>, [">= 0.7"])
@@ -171,7 +171,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<fog>, ["~> 1.2"])
       s.add_dependency(%q<formatador>, ["~> 0.2"])
       s.add_dependency(%q<gorillib>, ["~> 0.4.2"])
-      s.add_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8"])
       s.add_dependency(%q<yard>, [">= 0.7"])
@@ -184,7 +184,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fog>, ["~> 1.2"])
     s.add_dependency(%q<formatador>, ["~> 0.2"])
     s.add_dependency(%q<gorillib>, ["~> 0.4.2"])
-    s.add_dependency(%q<bundler>, ["~> 1.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8"])
     s.add_dependency(%q<yard>, [">= 0.7"])

data/lib/chef/knife/cluster_launch.rb

@@ -87,7 +87,6 @@ class Chef
         section("Launching computers", :green)
         display(target)
         launched = target.launch
-
         # As each server finishes, configure it
         Ironfan.parallel(launched) do |computer|
           if (computer.is_a?(Exception)) then ui.warn "Error launching #{computer.inspect}; skipping after-launch tasks."; next; end
@@ -107,7 +106,7 @@ class Chef
         Ironfan.step(computer.name, 'waiting for ready', :white)
         # Wait for machine creation on amazon side
         computer.machine.wait_for{ ready? }
-
+        
         # Try SSH
         unless config[:dry_run]
           Ironfan.step(computer.name, 'trying ssh', :white)
@@ -116,7 +115,7 @@ class Chef
 
         Ironfan.step(computer.name, 'final provisioning', :white)
         computer.save
-
+        
         # Run Bootstrap
         if config[:bootstrap]
           Chef::Log.warn "UNTESTED --bootstrap"

data/lib/ironfan/dsl/ec2.rb

@@ -25,7 +25,7 @@ module Ironfan
       magic :permanent,                 :boolean,       :default => false
       magic :placement_group,           String
       magic :provider,                  Whatever,       :default => Ironfan::Provider::Ec2
-      magic :public_ip,                 String
+      magic :elastic_ip,                String
       magic :region,                    String,         :default => ->{ default_region }
       collection :security_groups,      Ironfan::Dsl::Ec2::SecurityGroup, :key_method => :name
       magic :ssh_user,                  String,         :default => ->{ image_info[:ssh_user] }
@@ -34,6 +34,8 @@ module Ironfan
       magic :validation_key,            String,         :default => ->{ IO.read(Chef::Config.validation_key) rescue '' }
       magic :vpc,                       String
 
+      def domain;                       vpc.nil? ? 'standard' : 'vpc';       end
+
       def image_info
         bit_str = "#{self.bits.to_i}-bit" # correct for legacy image info.
         keys = [region, bit_str, backing, image_name]
@@ -61,7 +63,7 @@ module Ironfan
         values["AZ"] =                default_availability_zone
         return values if style == :default
 
-        values["Elastic IP"] =        public_ip if public_ip
+        values["Public IP"] =        elastic_ip if elastic_ip
         values
       end
 
@@ -277,8 +279,8 @@ Chef::Config[:ec2_flavor_info].merge!({
     # 32-or-64: m1.small, m1.medium, t1.micro, c1.medium
     't1.micro'    => { :price => 0.02,  :bits => 64, :ram =>    686, :cores => 1, :core_size => 0.25, :inst_disks => 0, :inst_disk_size =>    0, :ephemeral_volumes => 0 },
     'm1.small'    => { :price => 0.08,  :bits => 64, :ram =>   1740, :cores => 1, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  160, :ephemeral_volumes => 1 },
-    'm1.medium'   => { :price => 0.165, :bits => 32, :ram =>   3840, :cores => 2, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  410, :ephemeral_volumes => 1 },
-    'c1.medium'   => { :price => 0.17,  :bits => 32, :ram =>   1740, :cores => 2, :core_size => 2.5,  :inst_disks => 1, :inst_disk_size =>  350, :ephemeral_volumes => 1 },
+    'm1.medium'   => { :price => 0.165, :bits => 64, :ram =>   3840, :cores => 2, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  410, :ephemeral_volumes => 1 },
+    'c1.medium'   => { :price => 0.17,  :bits => 64, :ram =>   1740, :cores => 2, :core_size => 2.5,  :inst_disks => 1, :inst_disk_size =>  350, :ephemeral_volumes => 1 },
     #
     'm1.large'    => { :price => 0.32,  :bits => 64, :ram =>   7680, :cores => 2, :core_size => 2,    :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2 },
     'm2.xlarge'   => { :price => 0.45,  :bits => 64, :ram =>  18124, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  420, :ephemeral_volumes => 1 },

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

@@ -3,6 +3,63 @@ module Ironfan
     class Ec2
 
       class ElasticIp < Ironfan::Provider::Resource
+      	delegate :addresses, :associate_address, :allocation_id, 
+            :allocation_id=, :destroy, :domain, :domain=, 
+            :describe_addresses, :disassociate_address, :domain, :id,
+            :network_interface_id, :network_interface_id=, :public_ip, 
+            :public_ip=, :public_ip_address, :save, :server=, :server, :server_id, 
+            :server_id=,
+        :to => :adaptee
+ 
+        def self.shared?()              true;                               end
+        def self.multiple?()            false;                              end
+        def self.resource_type()        :elastic_ip;                        end
+        def self.expected_ids(computer) [ computer.server.ec2.elastic_ip ]; end
+        def name()                      adaptee.public_ip ;                 end
+
+        #
+        # Discovery
+        #
+
+        def self.load!(cluster=nil)
+          Ec2.connection.addresses.each do |eip|
+            register eip
+            Chef::Log.debug("Loaded #{eip}")
+
+            # The rest of this definition shows relevant information when -VV
+            #   is passed to knife and aids in troubleshooting any refusal to
+            #   attach Elastic IPs
+            Chef::Log.debug( "AWS domain: #{eip.domain}" )
+            Chef::Log.debug( "available ip match: #{eip.public_ip}" )
+            Chef::Log.debug( "----------------------" )
+          end
+
+          cluster.servers.each do |s|
+            next if s.ec2.elastic_ip.nil?
+            if recall? s.ec2.elastic_ip
+              Chef::Log.debug( "Cluster elastic_ip matches #{s.ec2.elastic_ip}" )
+            else
+              Chef::Log.debug( "No matching Elastic IP for #{s.ec2.elastic_ip}" )
+            end
+          end
+
+        end
+
+        #
+        # Manipulation
+        #
+
+        def self.save!(computer)
+          return unless computer.created?
+          elastic_ip = computer.server.ec2.elastic_ip
+          Ironfan.step(computer.name, "associating Elastic IP #{elastic_ip}", :blue)
+          Ironfan.unless_dry_run do
+            Ironfan.safely do
+              Ec2.connection.associate_address( computer.machine.id, elastic_ip )
+            end
+          end
+        end
+
       end
     end
   end

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

@@ -71,8 +71,8 @@ module Ironfan
         def to_display(style,values={})
           # style == :minimal
           values["State"] =             state.to_sym
-          values["MachineID"] =        id
-          values["Public IP"] =         public_ip_address
+          values["MachineID"] =         id
+          values["Public IP"] =         public_ip_address 
           values["Private IP"] =        private_ip_address
           values["Created On"] =        created_at.to_date
           return values if style == :minimal
@@ -163,7 +163,7 @@ module Ironfan
 
             fog_server.wait_for { ready? }
           end
-
+          
           # tag the computer correctly
           tags = {
             'cluster' =>      computer.server.cluster_name,
@@ -224,7 +224,6 @@ module Ironfan
             :client_key =>              computer.private_key
           }
 
-
           # Fog does not actually create tags when it creates a server;
           #  they and permanence are applied during sync
           description = {
@@ -236,7 +235,7 @@ module Ironfan
             :user_data            => JSON.pretty_generate(user_data_hsh),
             :block_device_mapping => block_device_mapping(computer),
             :availability_zone    => cloud.default_availability_zone,
-            :monitoring           => cloud.monitoring,
+            :monitoring           => cloud.monitoring
           }
 
           # VPC security_groups can only be addressed by id (not name)

data/lib/ironfan/provider/ec2.rb

@@ -5,7 +5,7 @@ module Ironfan
       self.handle = :ec2
 
       def self.resources
-        [ Machine, EbsVolume, Keypair, SecurityGroup, IamServerCertificate, ElasticLoadBalancer ]
+        [ Machine, ElasticIp, EbsVolume, Keypair, SecurityGroup, IamServerCertificate, ElasticLoadBalancer ]
       end
 
       #

data/lib/ironfan/requirements.rb

@@ -35,6 +35,7 @@ require 'ironfan/provider/ec2/machine'
 require 'ironfan/provider/ec2/keypair'
 require 'ironfan/provider/ec2/placement_group'
 require 'ironfan/provider/ec2/security_group'
+require 'ironfan/provider/ec2/elastic_ip'
 require 'ironfan/provider/ec2/elastic_load_balancer'
 require 'ironfan/provider/ec2/iam_server_certificate'
 

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.5.2
+  version: 4.6.0
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-27 00:00:00 Z
+date: 2012-12-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -63,7 +63,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: "1.0"
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -282,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2019769305702491484
+      hash: 852641782285257729
       segments: 
       - 0
       version: "0"