rubber 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ec3be4c2c2b486ddd2528e9db6b72b96d1fbf2f
-  data.tar.gz: ad0afb86cac74f88bc397e87a851434015d6683c
+  metadata.gz: ec73202ff7ae4b8b7141a4628e7ab7d4b5e3d628
+  data.tar.gz: 1ed2f951bbd777e967b53185dd8fed1ae3692e5f
 SHA512:
-  metadata.gz: 1184ac231a4cbdaad613d17749e53bf4a993d6affae6830ffd0b65a1ea9ea7af9a2a2965e86cc0408344cb4625f97a8071a1d8ac9b27963490687ba53a20f280
-  data.tar.gz: 3f25823f1f87443b3d4f9f0b189e5c3572a74dd5deafd3cdc7368339168308b2d50181b3b717d33343308918049e3742ada873919d1c17e051ced82914efb3bd
+  metadata.gz: 040dedab057535bbb42a545bd2c77569153c7317530a8f118b879eef54596c74f6a619ba65cf1eced96b89a60bd6416d04f058e3a10f4520f2931f72712be9f7
+  data.tar.gz: b746357fc5923292cbd90fce4c05358598708caa33079f95a1509914ccd5367631ca9da9207b7bb14f694b2f9625cf09dfbb658317d35874d73a98c680134ae4

data/CHANGELOG

@@ -1,3 +1,17 @@
+2.6.1 (11/06/2013)
+
+Improvements:
+============
+
+[core] Don't try to connect to the fog compute or storage providers until we actually need them. <5536511>
+
+Bug Fixes:
+=========
+
+[core] Fixed a bug attaching EBS volumes, introduced by a recent refactoring. <51d2619>
+[core] Fixed setup_remote_aliases to work when an SSH gateway is in place. <3a776f9>
+
+
 2.6.0 (11/05/2013)
 
 New Features:

data/lib/rubber/cloud/aws.rb

@@ -42,7 +42,7 @@ module Rubber
         opts = {}
         opts["instance-id"] = instance_id if instance_id
 
-        response = @compute_provider.servers.all(opts)
+        response = compute_provider.servers.all(opts)
         response.each do |item|
           instance = {}
           instance[:id] = item.id
@@ -158,14 +158,14 @@ module Rubber
         CMD
 
         image_location = "#{env.image_bucket}/#{image_name}.manifest.xml"
-        response = @compute_provider.register_image(image_name,
+        response = compute_provider.register_image(image_name,
                                                     "rubber bundled image",
                                                     image_location)
         return response.body["imageId"]
       end
 
       def destroy_image(image_id)
-        image = @compute_provider.images.get(image_id)
+        image = compute_provider.images.get(image_id)
         raise "Could not find image: #{image_id}, aborting destroy_image" if image.nil?
 
         location_parts = image.location.split('/')
@@ -204,7 +204,7 @@ module Rubber
 
       def describe_availability_zones
         zones = []
-        response = @compute_provider.describe_availability_zones()
+        response = compute_provider.describe_availability_zones()
         items = response.body["availabilityZoneInfo"]
         items.each do |item|
           zone = {}
@@ -216,7 +216,7 @@ module Rubber
       end
 
       def create_spot_instance_request(spot_price, ami, ami_type, security_groups, availability_zone)
-        response = @compute_provider.spot_requests.create(:price => spot_price,
+        response = compute_provider.spot_requests.create(:price => spot_price,
                                                           :image_id => ami,
                                                           :flavor_id => ami_type,
                                                           :groups => security_groups,
@@ -230,7 +230,7 @@ module Rubber
         requests = []
         opts = {}
         opts["spot-instance-request-id"] = request_id if request_id
-        response = @compute_provider.spot_requests.all(opts)
+        response = compute_provider.spot_requests.all(opts)
         response.each do |item|
           request = {}
           request[:id] = item.id
@@ -264,7 +264,7 @@ module Rubber
 
         opts = {}
         opts["group-name"] = group_name if group_name
-        response = @compute_provider.security_groups.all(opts)
+        response = compute_provider.security_groups.all(opts)
 
         response.each do |item|
           group = {}
@@ -302,33 +302,33 @@ module Rubber
       end
 
       def create_volume(instance, volume_spec)
-        volume = @compute_provider.volumes.create(:size => volume_spec['size'], :availability_zone => volume_spec['zone'])
+        volume = compute_provider.volumes.create(:size => volume_spec['size'], :availability_zone => volume_spec['zone'])
         volume.id
       end
 
       def after_create_volume(instance, volume_id, volume_spec)
         # After we create an EBS volume, we need to attach it to the instance.
-        volume = @compute_provider.volumes.get(volume_id)
-        server = @compute_provider.servers.get(instance.instance_id)
-        volume.device = device
+        volume = compute_provider.volumes.get(volume_id)
+        server = compute_provider.servers.get(instance.instance_id)
+        volume.device = volume_spec['device']
         volume.server = server
       end
 
       def before_destroy_volume(volume_id)
         # Before we can destroy an EBS volume, we must detach it from any running instances.
-        volume = @compute_provider.volumes.get(volume_id)
+        volume = compute_provider.volumes.get(volume_id)
         volume.force_detach
       end
 
       def destroy_volume(volume_id)
-        @compute_provider.volumes.get(volume_id).destroy
+        compute_provider.volumes.get(volume_id).destroy
       end
 
       def describe_volumes(volume_id=nil)
         volumes = []
         opts = {}
         opts[:'volume-id'] = volume_id if volume_id
-        response = @compute_provider.volumes.all(opts)
+        response = compute_provider.volumes.all(opts)
 
         response.each do |item|
           volume = {}
@@ -351,7 +351,7 @@ module Rubber
       def create_tags(resource_id, tags)
         # Tags need to be created individually in fog
         tags.each do |k, v|
-          @compute_provider.tags.create(:resource_id => resource_id,
+          compute_provider.tags.create(:resource_id => resource_id,
                                         :key => k.to_s, :value => v.to_s)
         end
       end
@@ -359,15 +359,15 @@ module Rubber
       private
 
       def create_security_group(group_name, group_description)
-        @compute_provider.security_groups.create(:name => group_name, :description => group_description)
+        compute_provider.security_groups.create(:name => group_name, :description => group_description)
       end
 
       def destroy_security_group(group_name)
-        @compute_provider.security_groups.get(group_name).destroy
+        compute_provider.security_groups.get(group_name).destroy
       end
 
       def add_security_group_rule(group_name, protocol, from_port, to_port, source)
-        group = @compute_provider.security_groups.get(group_name)
+        group = compute_provider.security_groups.get(group_name)
         opts = {:ip_protocol => protocol || 'tcp'}
 
         if source.instance_of? Hash
@@ -380,7 +380,7 @@ module Rubber
       end
 
       def remove_security_group_rule(group_name, protocol, from_port, to_port, source)
-        group = @compute_provider.security_groups.get(group_name)
+        group = compute_provider.security_groups.get(group_name)
         opts = {:ip_protocol => protocol || 'tcp'}
 
         if source.instance_of? Hash

data/lib/rubber/cloud/fog.rb

@@ -5,21 +5,24 @@ module Rubber
   module Cloud
   
     class Fog < Base
-      
-      attr_reader :compute_provider, :storage_provider
 
       def initialize(env, capistrano)
         super(env, capistrano)
 
-        compute_credentials = Rubber::Util.symbolize_keys(env.compute_credentials) if env.compute_credentials
-        storage_credentials = Rubber::Util.symbolize_keys(env.storage_credentials) if env.storage_credentials
+        @compute_credentials = Rubber::Util.symbolize_keys(env.compute_credentials) if env.compute_credentials
+        @storage_credentials = Rubber::Util.symbolize_keys(env.storage_credentials) if env.storage_credentials
+      end
+
+      def compute_provider
+        @compute_provider ||= @compute_credentials ? ::Fog::Compute.new(@compute_credentials) : nil
+      end
 
-        @compute_provider = compute_credentials ? ::Fog::Compute.new(compute_credentials) : nil
-        @storage_provider = storage_credentials ? ::Fog::Storage.new(storage_credentials) : nil
+      def storage_provider
+        @storage_provider ||= @storage_credentials ? ::Fog::Storage.new(@storage_credentials) : nil
       end
 
       def storage(bucket)
-        return Rubber::Cloud::FogStorage.new(@storage_provider, bucket)
+        return Rubber::Cloud::FogStorage.new(storage_provider, bucket)
       end
 
       def table_store(table_key)
@@ -27,7 +30,7 @@ module Rubber
       end
 
       def create_instance(instance_alias, ami, ami_type, security_groups, availability_zone, region)
-        response = @compute_provider.servers.create(:image_id => ami,
+        response = compute_provider.servers.create(:image_id => ami,
                                                     :flavor_id => ami_type,
                                                     :groups => security_groups,
                                                     :availability_zone => availability_zone,
@@ -38,40 +41,40 @@ module Rubber
       end
 
       def destroy_instance(instance_id)
-        response = @compute_provider.servers.get(instance_id).destroy()
+        response = compute_provider.servers.get(instance_id).destroy()
       end
 
       def destroy_spot_instance_request(request_id)
-        @compute_provider.spot_requests.get(request_id).destroy
+        compute_provider.spot_requests.get(request_id).destroy
       end
   
       def reboot_instance(instance_id)
-        response = @compute_provider.servers.get(instance_id).reboot()
+        response = compute_provider.servers.get(instance_id).reboot()
       end
 
       def stop_instance(instance, force=false)
         # Don't force the stop process. I.e., allow the instance to flush its file system operations.
-        response = @compute_provider.servers.get(instance.instance_id).stop(force)
+        response = compute_provider.servers.get(instance.instance_id).stop(force)
       end
 
       def start_instance(instance)
-        response = @compute_provider.servers.get(instance.instance_id).start()
+        response = compute_provider.servers.get(instance.instance_id).start()
       end
 
       def create_static_ip
-        address = @compute_provider.addresses.create()
+        address = compute_provider.addresses.create()
         return address.public_ip
       end
 
       def attach_static_ip(ip, instance_id)
-        address = @compute_provider.addresses.get(ip)
-        server = @compute_provider.servers.get(instance_id)
+        address = compute_provider.addresses.get(ip)
+        server = compute_provider.servers.get(instance_id)
         response = (address.server = server)
         return ! response.nil?
       end
 
       def detach_static_ip(ip)
-        address = @compute_provider.addresses.get(ip)
+        address = compute_provider.addresses.get(ip)
         response = (address.server = nil)
         return ! response.nil?
       end
@@ -80,7 +83,7 @@ module Rubber
         ips = []
         opts = {}
         opts["public-ip"] = ip if ip
-        response = @compute_provider.addresses.all(opts)
+        response = compute_provider.addresses.all(opts)
         response.each do |item|
           ip = {}
           ip[:instance_id] = item.server_id
@@ -91,7 +94,7 @@ module Rubber
       end
 
       def destroy_static_ip(ip)
-        address = @compute_provider.addresses.get(ip)
+        address = compute_provider.addresses.get(ip)
         return address.destroy
       end
 
@@ -103,7 +106,7 @@ module Rubber
         images = []
         opts = {"Owner" => "self"}
         opts["image-id"] = image_id if image_id
-        response = @compute_provider.images.all(opts)
+        response = compute_provider.images.all(opts)
         response.each do |item|
           image = {}
           image[:id] = item.id

data/lib/rubber/cloud/vsphere.rb

@@ -148,7 +148,7 @@ module Rubber
       end
 
       def create_volume(instance, volume_spec)
-        server = @compute_provider.servers.get(instance.instance_id)
+        server = compute_provider.servers.get(instance.instance_id)
         datastore = volume_spec['datastore']
         thin_disk = volume_spec.has_key?('thin') ? volume_spec['thin'] : true
 
@@ -177,7 +177,7 @@ module Rubber
 
       def destroy_volume(volume_id)
         # TODO (nirvdrum 10/28/13): Fog currently lacks the ability to fetch a volume by ID, so we need to fetch all volumes for all servers to find the volume we want.  This is terribly inefficient and fog should be updated.
-        volume = @compute_provider.servers.collect { |s| s.volumes.all }.flatten.find { |v| v.id == volume_id }
+        volume = compute_provider.servers.collect { |s| s.volumes.all }.flatten.find { |v| v.id == volume_id }
 
         if volume.unit_number == 0
           raise "Cannot destroy volume because it is the VM root device.  Destroy the VM if you really want to free this volume."
@@ -192,9 +192,9 @@ module Rubber
         opts[:'volume-id'] = volume_id if volume_id
 
         if volume_id
-          response = [@compute_provider.servers.collect { |s| s.volumes.all }.flatten.find { |v| v.id == volume_id }]
+          response = [compute_provider.servers.collect { |s| s.volumes.all }.flatten.find { |v| v.id == volume_id }]
         else
-          response = @compute_provider.servers.collect { |s| s.volumes.all }.flatten
+          response = compute_provider.servers.collect { |s| s.volumes.all }.flatten
         end
 
         response.each do |item|
@@ -247,7 +247,6 @@ module Rubber
           # Null values are represented as "null" in YAML, but Rubyists tend to use "nil", which will get translated
           # to the literal String "nil". Which guarding against this is arguably bad, letting "nil" go through as a valid
           # gateway value is even worse.
-          puts "\n\nGateway: #{nic['gateway']}\n\n"
           if nic['gateway'] && nic['gateway'] != 'nil'
             hash['gateway'] = [nic['gateway']]
           end

data/lib/rubber/recipes/rubber/setup.rb

@@ -187,15 +187,25 @@ namespace :rubber do
 
       replace="#{delim}\\n#{remote_hosts.join("\\n")}\\n#{delim}"
 
-      rubber.sudo_script 'setup_remote_aliases', <<-ENDSCRIPT
+      setup_remote_aliases_script = <<-ENDSCRIPT
         sed -i.bak '/#{delim}/,/#{delim}/c #{replace}' /etc/hosts
         if ! grep -q "#{delim}" /etc/hosts; then
           echo -e "#{replace}" >> /etc/hosts
         fi
       ENDSCRIPT
 
+      # If an SSH gateway is being used to deploy to the cluster, we need to ensure that gateway has an updated /etc/hosts
+      # first, otherwise it won't be able to resolve the hostnames for the other servers we need to connect to.
+      gateway = fetch(:gateway, nil)
+      if gateway
+        rubber.sudo_script 'setup_remote_aliases', setup_remote_aliases_script, :hosts => gateway
+      end
+
+      rubber.sudo_script 'setup_remote_aliases', setup_remote_aliases_script
+
       # Setup hostname on instance so shell, etcs have nice display
       rsudo "echo $CAPISTRANO:HOST$ > /etc/hostname && hostname $CAPISTRANO:HOST$"
+
       # Newer ubuntus ec2-init script always resets hostname, so prevent it
       rsudo "mkdir -p /etc/ec2-init && echo compat=0 > /etc/ec2-init/is-compat-env"
     end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano