[openstack] Re-record VCRs, plus some light refactoring

Also, the bug in webmock 1.22.1 is now fixed, so enforce webmock  1.22.2 or higher

fog.gemspec

@@ -93,7 +93,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec-core")
   s.add_development_dependency("rspec-expectations")
   s.add_development_dependency("vcr")
-  s.add_development_dependency("webmock")
+  s.add_development_dependency("webmock","~>1.22.2")
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

lib/fog/openstack/core.rb

@@ -154,17 +154,16 @@ def authenticate
         @port   = @openstack_management_uri.port
         @scheme = @openstack_management_uri.scheme
 
-        # Not all implementations have identity service in the catalog
-        if @openstack_identity_public_endpoint || @openstack_management_url
-          @identity_connection = Fog::Core::Connection.new(
-            @openstack_identity_public_endpoint || @openstack_management_url,
-            false, @connection_options)
-        end
-
         true
       end
     end
 
+    @@token_cache = {}
+
+    def self.clear_token_cache
+      @@token_cache.clear
+    end
+
     def self.authenticate(options, connection_options = {})
       case options[:openstack_auth_uri].path
       when /v1(\.\d+)?/
@@ -410,7 +409,7 @@ def self.retrieve_tokens_v2(options, connection_options = {})
       auth_token  = options[:openstack_auth_token] || options[:unscoped_token]
       uri         = options[:openstack_auth_uri]
 
-      connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
+      @identity_connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => Hash.new}
 
       if auth_token
@@ -425,7 +424,7 @@ def self.retrieve_tokens_v2(options, connection_options = {})
       end
       request_body[:auth][:tenantName] = tenant_name if tenant_name
 
-      response = connection.request({
+      response = @identity_connection.request({
         :expects  => [200, 204],
         :headers  => {'Content-Type' => 'application/json'},
         :body     => Fog::JSON.encode(request_body),
@@ -506,15 +505,14 @@ def self.retrieve_tokens_v3(options, connection_options = {})
 
       path     = (uri.path and not uri.path.empty?) ? uri.path : 'v3'
 
-      @@token_cache  ||= {}
       response, expires = @@token_cache[{body: request_body, path: path}]
 
       unless response && expires > Time.now
         response = connection.request({   :expects => [201],
                                           :headers => {'Content-Type' => 'application/json'},
                                           :body    => Fog::JSON.encode(request_body),
                                           :method  => 'POST',
-                                          :path    => (uri.path and not uri.path.empty?) ? uri.path : 'v3'
+                                          :path    => path
                                       })
         @@token_cache[{body: request_body, path: path}] = response, Time.now + 30 # 30-second TTL, enough for most requests
       end