fog-openstack 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea0e7a81cd4d076ed16a5cab127a5ab730881d3e
-  data.tar.gz: 5128d367de9376015965157fbc610040b11be008
+  metadata.gz: 312e6d4047265d21afbec1d567737d1df00bdba0
+  data.tar.gz: ecc4a345b353514f3b90e06517306470d687862b
 SHA512:
-  metadata.gz: 25784e5390b52943bfb2af9b0e99dc4f53a5fc1d443d7fa82b4677a4a8bb0c321078cb5c9e184d6033fc7e1737bd5b9c61cbf7d9ad2914d4e34b06a0636bf276
-  data.tar.gz: 222a1f8668c1b81c5be08e5264cc956e61f9a46efecf96635efa5258ee325971fc46647a695acfc04132991b5af1813f70bd769b67b3cbed2b9436fb3a02df5b
+  metadata.gz: 2c79549368ed986a4a82076a8a47c28132673e4e1a40ca5a650bc5c2f440f48058822442f7b4178f18e78d60b1caf123bfb4d90d90f61915901782866ebcd8dd
+  data.tar.gz: 5e76051a410e35fc90a7cd2f8c43df468b9c5ad08c7d2e03d197607a2e8de1662f3bc08760ca43c4d93fbf225d8bda3b298e03fc32678680815ec028f0bb5efd

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 = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 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