Merge remote-tracking branch 'upstream/master'

lib/fog/aws/models/auto_scaling/configuration.rb

@@ -7,6 +7,7 @@ module Fog
 
         identity  :id,                    :aliases => 'LaunchConfigurationName'
         attribute :arn,                   :aliases => 'LaunchConfigurationARN'
+        attribute :associate_public_ip,   :aliases => 'AssociatePublicIpAddress'
         attribute :block_device_mappings, :aliases => 'BlockDeviceMappings'
         attribute :created_at,            :aliases => 'CreatedTime'
         attribute :iam_instance_profile,  :aliases => 'IamInstanceProfile'

lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb

@@ -72,6 +72,9 @@ module Fog
               @launch_configuration[name] = value
             when 'SpotPrice'
               @launch_configuration[name] = value.to_f
+
+            when 'AssociatePublicIpAddress'
+              @in_associate_public_ip = false
             when 'BlockDeviceMappings'
               @in_block_device_mappings = false
             when 'LaunchConfigurations'

lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb

@@ -83,6 +83,7 @@ module Fog
             raise Fog::AWS::AutoScaling::IdentifierTaken.new("Launch Configuration by this name already exists - A launch configuration already exists with the name #{launch_configuration_name}")
           end
           self.data[:launch_configurations][launch_configuration_name] = {
+            'AssociatePublicIpAddress' => nil,
             'BlockDeviceMappings'     => [],
             'CreatedTime'             => Time.now.utc,
             'IamInstanceProfile'      => nil,

lib/fog/openstack/storage.rb

@@ -26,6 +26,7 @@ module Fog
       request :get_container
       request :get_containers
       request :get_object
+      request :get_object_http_url
       request :get_object_https_url
       request :head_container
       request :head_containers
@@ -35,6 +36,7 @@ module Fog
       request :put_object_manifest
       request :put_dynamic_obj_manifest
       request :put_static_obj_manifest
+      request :post_set_meta_temp_url_key
 
       class Mock