generic.rb in rubber-2.15.0

- old
+ new
@@ -24,19 +24,19 @@
 
       def active_state
         'active'
       end
 
-      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, region)
+      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, region, fog_options={})
         instance = {}
         instance[:id] = instance_alias
         instance[:state] = active_state
         instance[:external_ip] = capistrano.rubber.get_env('EXTERNAL_IP', "External IP address for host '#{instance_alias}'", true)
         instance[:internal_ip] = capistrano.rubber.get_env('INTERNAL_IP', "Internal IP address for host '#{instance_alias}'", true, instance[:external_ip])
         instance[:provider] = 'generic'
         instance[:platform] = Rubber::Platforms::LINUX
 
-        Generic.add_instance(instance)
+        Generic.add_instance(instance.merge(Rubber::Util.symbolize_keys(fog_options)))
 
         instance_alias
       end
 
       def describe_instances(instance_id=nil)
\ No newline at end of file