fog-openstack 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecda82f58600858370cf9cfaf02cce488a57bc8
-  data.tar.gz: 45287b13e8061378835d5da407b491016b1aa172
+  metadata.gz: 39cd4a4f51a9a8cdc53e08bc406ccdad889ca29e
+  data.tar.gz: 6dfa9f87ad922e621765585fadd7c96e07d3117d
 SHA512:
-  metadata.gz: c8473feca37f5c98d830f91e4942609cc4c64664798203352e7a0f400621c507ba1f18d4c5c2ada45986771690ddd114ddb637583ab37bf3d80d8228e4096cb8
-  data.tar.gz: 69ba5d22a7f10d0864fbff96b7c56feea3456b02fb417e6bbe7d69c7620a819d5d32d4a36cdb04e95a42184e2c4c8aa14f29929706ceded413f2aa55be5ec5f8
+  metadata.gz: 83288f34c2571e579f596c794752a28e9fe05ef3afe109e1f3712d6219244caf411a1627d0449181f78dcb725358e79747da42dde52e9cbaa9f6da882808017a
+  data.tar.gz: 5c417eff1ac670fafb9c95ac553703784935c758e839f079a5e08bb7ef94bbb865444fff0eb0432d6fc2cd4ca596dc3509a768204bdd891339f49b6d4e56a412

data/lib/fog/openstack/auth/token.rb

@@ -47,7 +47,7 @@ module Fog
             :headers => {'Content-Type' => 'application/json'},
             :body    => Fog::JSON.encode(creds[:data]),
             :method  => 'POST',
-            :path    => creds[:uri].path + path
+            :path    => creds[:uri].path + prefix_path(creds[:uri]) + path
           }
 
           connection.request(request)

data/lib/fog/openstack/auth/token/v2.rb

@@ -29,8 +29,16 @@ module Fog
             {'auth' => identity}
           end
 
+          def prefix_path(uri)
+            if uri.path =~ /\/v2(\.0)*(\/)*.*$/
+              ''
+            else
+              '/v2.0'
+            end
+          end
+
           def path
-            '/v2.0/tokens'
+            '/tokens'
           end
 
           def user_credentials

data/lib/fog/openstack/auth/token/v3.rb

@@ -37,8 +37,16 @@ module Fog
             end
           end
 
+          def prefix_path(uri)
+            if uri.path =~ /\/v3(\/)*.*$/
+              ''
+            else
+              '/v3'
+            end
+          end
+
           def path
-            '/v3/auth/tokens'
+            '/auth/tokens'
           end
 
           def scope

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '0.3.5'.freeze
+    VERSION = '0.3.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core