compute.rb in fog-1.6.0

- old
+ new

@@ -7,11 +7,11 @@
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url,
                  :persistent, :openstack_service_name, :openstack_tenant,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
-                 :current_user, :current_tenant
+                 :current_user, :current_tenant, :openstack_region
 
       ## MODELS
       #
       model_path 'fog/openstack/models/compute'
       model       :server
@@ -247,10 +247,11 @@
           @openstack_auth_uri   = URI.parse(options[:openstack_auth_url])
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
           @openstack_service_name = options[:openstack_service_name] || ['nova', 'compute']
           @openstack_identity_service_name = options[:openstack_identity_service_name] || 'identity'
+          @openstack_region      = options[:openstack_region]
 
           @connection_options = options[:connection_options] || {}
 
           @current_user = options[:current_user]
           @current_tenant = options[:current_tenant]
@@ -265,10 +266,11 @@
           { :provider                 => 'openstack',
             :openstack_auth_url       => @openstack_auth_uri.to_s,
             :openstack_auth_token     => @auth_token,
             :openstack_management_url => @openstack_management_url,
             :openstack_identity_endpoint => @openstack_identity_public_endpoint,
+            :openstack_region         => @openstack_region,
             :current_user             => @current_user,
             :current_tenant           => @current_tenant }
         end
 
         def reload
@@ -317,9 +319,10 @@
             options = {
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
               :openstack_auth_token => @openstack_auth_token,
               :openstack_auth_uri => @openstack_auth_uri,
+              :openstack_region   => @openstack_region,
               :openstack_tenant   => @openstack_tenant,
               :openstack_service_name => @openstack_service_name,
               :openstack_identity_service_name => @openstack_identity_service_name
             }
 