awsome 0.0.11 → 0.0.12

data/lib/awsome/ec2.rb

@@ -124,6 +124,17 @@ module Awsome
       end
     end
 
+    @@associate_address_columns = %w(
+      identifier 
+      elastic_ip
+      instance_id
+    )
+
+    def self.associate_address(instance_id, ip_address)
+      cmd = Awsome::Ec2.command('ec2-associate-address', ip_address, instance: instance_id)
+      Awsome.execute(cmd, columns: @@associate_address_columns, filter: /^ADDRESS/)
+    end
+
     def self.attach_volume(volume_id, instance_id, device)
       cmd = Awsome::Ec2.command('ec2-attach-volume', volume_id, instance: instance_id, device: device)
       Awsome.execute(cmd)

data/lib/awsome/ec2/instance.rb

@@ -33,6 +33,28 @@ module Awsome
         Awsome::Ssh.ssh(@properties['public_dns_name'], *args)
       end
 
+      def associate_ips(*elastic_ips)
+        elastic_ips.each do |ip|
+          Awsome::Ec2.associate_address(@properties['instance_id'], ip)
+        end
+      end
+
+      def install_hosts_entries(ip_address, *hostnames)
+        sed = []
+        cmd = []
+
+        # we will remove all hosts entries for the given "ip_address"
+        sed << "sed '/^#{ip_address}/d"
+
+        # we will remove all hosts entries for each of the given "hostnames"
+        sed += hostnames.collect { |h| "sed '/ #{h} /d'" }
+
+        cmd << "sudo cat /etc/hosts | #{sed.join(' | ')} > /etc/hosts.temp"
+        cmd << "sudo echo '#{ip_address} #{hostnames.join(' ')} # GENERATED' >> /etc/hosts.temp"
+        cmd << "sudo mv /etc/hosts.temp /etc/hosts"
+        ssh(cmd)
+      end
+
       def reattach_volumes(*volumes)
         volumes.each do |info| 
           Awsome::Ec2.detach_volume(info['id'], info['dir'], info['preumount'])

data/lib/awsome/executor.rb

@@ -57,6 +57,12 @@ module Awsome
           instance.deregister_from_elbs
           instance.remove_packages(*requirement.packages_to_remove(instance))
           instance.install_packages(*requirement.packages_to_install(instance))
+
+          instances_to_use do |other_instance, other_requirement|
+            other_instance.install_hosts_entries(instance.properties['private_dns_name'], *requirement.hostnames)
+          end
+
+          instance.associate_ips(*requirement.elastic_ips)
           instance.register_with_elbs(*requirement.elbs)
         end
       end

data/lib/awsome/instance_requirement.rb

@@ -9,7 +9,15 @@ module Awsome
     end
 
     def elbs
-      @properties['elbs']
+      @properties['elbs'] || []
+    end
+
+    def elastic_ips
+      @properties['elastic_ips'] || []
+    end
+
+    def hostnames
+      @properties['hostnames'] || []
     end
 
     def volumes_to_attach(instance)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsome
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors: