zzdeploy 0.1.10 → 0.1.11

data/lib/commands/add_instance.rb

@@ -16,6 +16,8 @@ module Commands
       @required_options ||= Set.new [
           :role,
           :group,
+          :config_access_key,
+          :config_secret_key,
       ]
     end
 
@@ -50,6 +52,14 @@ module Commands
       opts.on('-p', "--print path", "The directory into which we output the data as a file per host.") do |v|
         options[:result_path] = v
       end
+
+      opts.on("--config_akey AmazonAccessKey", "Required - Amazon access key to store on server.") do |v|
+        options[:config_access_key] = v
+      end
+
+      opts.on("--config_skey AmazonSecretKey", "Required - Amazon secret key to store on server.") do |v|
+        options[:config_secret_key] = v
+      end
     end
 
 
@@ -156,6 +166,12 @@ module Commands
       # do the initial upload step for the chef recipes by fetching the proper tag on the remote machine
       ec2.create_tags(inst_id, {:state => 'ready' })
 
+      remote_cmd = "#{ssh_cmd} #{make_amazon_config_command(options[:config_access_key], options[:config_secret_key])}"
+      result = ZZSharedLib::CL.do_cmd_result remote_cmd
+      if result != 0
+        raise "The instance was created but we were unable to upload amazon keys."
+      end
+
       git_cmd = ChefUpload.get_upload_command(recipes_deploy_tag)
       remote_cmd = "#{ssh_cmd} \"#{git_cmd}\""
       result = ZZSharedLib::CL.do_cmd_result remote_cmd
@@ -183,5 +199,22 @@ module Commands
       end
 
     end
+
+    # build the command to create the amazon.json file containing the keys passed
+    def make_amazon_config_command(akey, skey)
+      file = "/var/chef/test.json"
+      cmd =
+"'sudo rm -f #{file}
+(
+cat <<'EOP'
+{
+  \"aws_access_key_id\": \"#{akey}\",
+  \"aws_secret_access_key\": \"#{skey}\"
+}
+EOP
+) > #{file}
+sudo chown root:root #{file}
+sudo chmod 0644 #{file}'"
+    end
   end
 end

data/lib/info.rb

@@ -1,5 +1,5 @@
 class Info
   def self.version
-    "0.1.10"
+    "0.1.11"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Greg Seitz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 -08:00
+date: 2012-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency