Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:jamesneal/fog

  • Loading branch information...
commit 83036a542cfbb6e516484dee1ac39d9325979f50 2 parents f26f481 + 74e7efd
@Laenfinehack Laenfinehack authored
View
5 lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb
@@ -23,8 +23,7 @@ class Real
# * 'Ebs.VolumeSize'<~Integer> - The volume size, in GigaBytes.
# * 'VirtualName'<~String> - The virtual name associated with the
# device.
- # * 'InstanceMonitoring'<~Hash>:
- # * 'Enabled'<~Boolean> - Enabled detailed monitoring.
+ # * 'InstanceMonitoring.Enabled'<~Boolean> - Enable/Disable detailed monitoring, default is enabled
# * 'KernelId'<~String> - The ID of the kernel associated with the
# EC2 AMI.
# * 'KeyName'<~String> - The name of the EC2 key pair.
@@ -79,7 +78,7 @@ def create_launch_configuration(image_id, instance_type, launch_configuration_na
'BlockDeviceMappings' => [],
'CreatedTime' => Time.now.utc,
'ImageId' => image_id,
- 'InstanceMonitoring' => { 'Enabled' => true },
+ 'InstanceMonitoring.Enabled' => true
'InstanceType' => instance_type,
'KernelId' => nil,
'KeyName' => nil,
View
2  lib/fog/openstack/models/compute/server.rb
@@ -215,7 +215,7 @@ def save
'accessIPv4' => accessIPv4,
'accessIPv6' => accessIPv6,
'availability_zone' => availability_zone,
- 'userdata' => user_data_encoded,
+ 'user_data' => user_data_encoded,
'key_name' => key_name,
'security_groups' => @security_groups,
'min_count' => @min_count,
Please sign in to comment.
Something went wrong with that request. Please try again.