ec2.rb in auser-poolparty-1.3.10

- old
+ new

@@ -61,11 +61,11 @@
     # Load the yaml file containing keys.  If the file does not exist, return an empty hash
     def self.load_keys_from_file(filename='/etc/poolparty/env.yml', caching=true)
       return @aws_yml if @aws_yml && caching==true
       return {} unless File.exists?(filename)
       ddputs("Reading keys from file: #{filename}")
-      @aws_yml = YAML::load( open(filename).read )
+      @aws_yml = YAML::load( open(filename).read ) || {}
     end
     
     default_options({
         :image_id               => 'ami-bf5eb9d6',
         :instance_type          => 'm1.small',
@@ -92,10 +92,10 @@
         :ebs_volume_id          => nil  # The volume id of an ebs volume # TODO: ensure this is consistent with :block_device_mappings
       })
       
       
     def ec2(o={})
-      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog, :default_host => ec2_url))
+      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog, :endpoint_url => ec2_url))
     end
     
     # Start a new instance with the given options
     def run_instance(o={})
       set_vars_from_options o
\ No newline at end of file