kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

fixes for AWS provisioning

Browse source
This commit is contained in:
Sam Merritt 2009-10-22 02:36:49 +08:00 • committed by Wesley Beary
parent 191465d9c8
commit 191ed37d20
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog.rb
View file

@ -4,6 +4,8 @@ $LOAD_PATH.unshift __DIR__ unless
$LOAD_PATH.include?(__DIR__) ||
$LOAD_PATH.include?(File.expand_path(__DIR__))
require 'base64'
module Fog
def self.mock!

4
lib/fog/aws/models/ec2/instance.rb
View file

@ -82,7 +82,7 @@ module Fog
options['groupId'] = @group_id
end
if @instance_type
options['instanceType'] = @instance_type
options['InstanceType'] = @instance_type
end
if @kernel_id
options['KernelId'] = @kernel_id
@ -97,7 +97,7 @@ module Fog
options['RamdiskId'] = @ramdisk_id
end
if @user_data
options['UserData'] = @user_data
options['UserData'] = Base64.encode64(@user_data)
end
data = connection.run_instances(@image_id, 1, 1, options)
merge_attributes(data.body['instancesSet'].first)