jzimmek-ec2 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/ec2.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Zimmek"]

data/lib/ec2/instance_binding.rb

@@ -21,12 +21,13 @@ module Ec2
 
       @ssh = Net::SSH.start(@public_dns_name, "root", :keys => [@cloud.ssh_key_file], :paranoid => false)
 
-      user_data = fetch_from_url("http://169.254.169.254/2009-04-04/user-data")
+      # user_data = fetch_from_url("http://169.254.169.254/2009-04-04/user-data")
 
-      @hostname = user_data.index("Not Found") ? nil : user_data
+      # @hostname = user_data.index("Not Found") ? nil : user_data
+      
+      @hostname = fetch_from_file("/root/.hostname")
     
       if @hostname
-        
         Pending.remove(@hostname)
         
         @public_ip      = fetch_from_url("http://169.254.169.254/latest/meta-data/public-ipv4")
@@ -78,6 +79,7 @@ module Ec2
       @ssh.exec!("rm #{file}")
       @ssh.exec!("curl -o #{file} #{url}")
       value = @ssh.exec!("cat #{file}")
+      value.strip! if value
       puts "fetch from #{url}: #{value}"
       @ssh.exec!("rm #{file}")
       value
@@ -86,6 +88,7 @@ module Ec2
     def fetch_from_file(file)
       @ssh.exec!("touch #{file}")
       value = @ssh.exec!("cat #{file}")
+      value.strip! if value
       puts "fetch from #{file}: #{value}"
       value
     end

data/lib/ec2/manager.rb

@@ -53,12 +53,18 @@ module Ec2
     def startup(instance)
       
       unless Pending.pending?(instance.name)
+        
+        user_data = instance.userdata
+        
+        user_data << "\necho \"#{instance.name}\" > /root/.hostname" if user_data
+        
         opts = {
           :image_id           => instance.ami, 
           :min_count          => 1, 
           :max_count          => 1,
           :key_name           => instance.keypair,
-          :user_data          => Base64.encode64(instance.name),
+          # :user_data          => Base64.encode64(instance.name),
+          :user_data          => Base64.encode64(user_data),
           :instance_type      => "m1.small"
         }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -37,6 +37,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/jzimmek/ec2
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Management tool for EC2 clouds