fog-openstack 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70342e05368a8b5eee2e3b0cc8bfa02f2201156
-  data.tar.gz: d0794fd0a519e1e9a1e0501d22f04b14f5f17c90
+  metadata.gz: 9b30f652b4b6df666a43ce5d8a5df9e999062ea3
+  data.tar.gz: b0ef11fb9333c0987ae31ecead2c2f99ddf107a6
 SHA512:
-  metadata.gz: 9c974aa8e32e72c4bf8397c5881563e7349a54ce13b3f3f92dddd2f8434d32ee53b3c636f0316f7da4c18ca03b95e808e6848f4ea4e3c8595b84de1e8213297d
-  data.tar.gz: 7e1d1a0ebcbdd7582beb275d66a66bb24dfa08b64072a015a57c8c311aa67217b040e2b33b7be418ef379ccffb59f21399aae04dd381381b81b1e7e38266307a
+  metadata.gz: b96108935e442c7667530a689be9911a55a1c5d137b0072e322af3c47140e9fb1cdbae3f679838bda873169f719e84521bd08cef8b94ca9bf23d078f18e36e7d
+  data.tar.gz: 3b95ad280e133a331c803e7fd9b5daf3632085fa1ee0c05304cf9202e957a38a223c5eabe2752c4a81354483877ba6ff8aea8c45b81b885205b41e17e0f285f2

data/lib/fog/identity/openstack.rb

@@ -12,11 +12,13 @@ module Fog
                     # Will be removed in future after hard deprecation is enforced for a couple of releases
                     Fog::Logger.deprecation("An authentication URL including a version is deprecated")
                     case args[:openstack_auth_url]
-                    when /v3/
-                      args[:openstack_auth_url].gsub!(/\/v3(\/)*.*/, '')
-                      'v3'
-                    when /v2(\.0)*/
-                      args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*/, '')
+                    when /\/v3(\/)*.*$/
+                      args[:openstack_auth_url].gsub!(/\/v3(\/)*.*$/, '')
+                      args[:no_path_prefix] = true
+                      '3'
+                    when /\/v2(\.0)*(\/)*.*$/
+                      args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*$/, '')
+                      args[:no_path_prefix] = true
                       '2.0'
                     end
                   end

data/lib/fog/identity/openstack/v2.rb

@@ -14,7 +14,7 @@ module Fog
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                    :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
-                   :openstack_identity_api_version
+                   :openstack_identity_api_version, :no_path_prefix
 
         model_path 'fog/identity/openstack/v2/models'
         model :tenant
@@ -169,8 +169,17 @@ module Fog
         end
 
         class Real < Fog::Identity::OpenStack::Real
+          def initialize(args)
+            @path_prefix = if args[:no_path_prefix]
+                             ''
+                           else
+                             'v2.0'
+                           end
+            super
+          end
+
           def default_path_prefix
-            'v2.0'
+            @path_prefix
           end
 
           def default_service_type

data/lib/fog/identity/openstack/v3.rb

@@ -13,7 +13,7 @@ module Fog
                    :openstack_user_domain_id, :openstack_project_domain_id,
                    :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
                    :current_user, :current_user_id, :current_tenant,
-                   :provider, :openstack_identity_api_version, :openstack_cache_ttl
+                   :provider, :openstack_identity_api_version, :openstack_cache_ttl, :no_path_prefix
 
         model_path 'fog/identity/openstack/v3/models'
         model :domain
@@ -142,8 +142,17 @@ module Fog
         end
 
         class Real < Fog::Identity::OpenStack::Real
+          def initialize(args)
+            @path_prefix = if args[:no_path_prefix]
+                             ''
+                           else
+                             'v3'
+                           end
+            super
+          end
+
           def default_path_prefix
-            'v3'
+            @path_prefix
           end
 
           def default_service_type

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

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