poolparty 1.3.7 → 1.3.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 3
-:patch: 7
+:patch: 8
 :major: 1

data/lib/cloud_providers/ec2/ec2.rb

@@ -25,13 +25,13 @@ require "#{File.dirname(__FILE__)}/ec2_instance"
 module CloudProviders
   class Ec2 < CloudProvider
     
-    # Set the aws keys from the environment, or load from /etc/poolparty/aws.yml if the environment variable is not set
+    # Set the aws keys from the environment, or load from /etc/poolparty/env.yml if the environment variable is not set
     def self.default_access_key
       ENV['EC2_ACCESS_KEY'] || load_keys_from_file[:access_key]
     end
     
     def self.default_secret_access_key
-      ENV['EC2_SECRET_KEY'] || load_keys_from_file[:access_key]
+      ENV['EC2_SECRET_KEY'] || load_keys_from_file[:secret_access_key]
     end
     
     def self.default_private_key
@@ -59,9 +59,10 @@ module CloudProviders
     end
     
     # 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/ec2/aws.yml', caching=true)
+    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 )
     end
     
@@ -93,7 +94,7 @@ module CloudProviders
       
       
     def ec2(o={})
-      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog))
+      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog, :default_host => ec2_url))
     end
     
     # Start a new instance with the given options
@@ -153,6 +154,14 @@ module CloudProviders
        ].include?(ec2_url)
     end
     
+    # Callbacks
+    def before_compile(cld)
+    end
+    
+    def after_compile(cld)
+      save_aws_env_to_yml(cld.tmp_path/"etc"/"poolparty"/"env.yml")
+    end
+    
     # Read  yaml file and use it to set environment variables and local variables.
     def set_aws_env_from_yml_file(filename='/etc/poolparty/env.yml')
       aws = self.class.load_keys_from_file(filename)
@@ -161,8 +170,8 @@ module CloudProviders
     end
     
     # Save aws keys and env variables to a yaml file
-    def save_aws_env_to_yml(filename='/etc/poolparty/aws.yml')
-      File.open(filename, 'w') {|f| f<<YAML::dump(aws_hash) }
+    def save_aws_env_to_yml(filename='/etc/poolparty/env.yml')
+      File.open(filename, 'w') {|f| f<<YAML::dump(aws_hash(dsl_options, "/etc/poolparty/ec2")) } rescue nil
     end
     
     # Return a hash of the aws keys and environment variables

data/lib/cloud_providers/ec2/ec2_instance.rb

@@ -64,7 +64,7 @@ module CloudProviders
       FileUtils.mkdir_p(cloud.tmp_path/ec2_dir) unless File.directory?(cloud.tmp_path/ec2_dir)
       run ["mkdir -p #{ec2_dir}"]
       # Save a yaml file of aws varibles and send to the instance
-      File.open(cloud.tmp_path/ec2_dir/'aws.yml', 'w') do |f|
+      File.open(cloud.tmp_path/"etc"/"poolparty"/'env.yml', 'w') do |f|
         f<<YAML::dump(cloud_provider.aws_hash(ec2_dir))  #TODO: don't save sensitive info in /tmp
       end
       # We scp these files directly to the instance so to reduce the risk of accidentally leaving them in an insecure location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors: 
 - Ari Lerner