misty 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c484478917eb09469e637f0b6c4f3ebe46c977b
-  data.tar.gz: c1200a007c58cc7cced9a07fb1e0b4e51e60cc5e
+  metadata.gz: 39ef5d2b5855f445d3202c466f0b6d54ee673b47
+  data.tar.gz: 99f2298d30b27b21ffdb7ab4be9e8acba981b3f0
 SHA512:
-  metadata.gz: e56315c7dcc72fe5d17e616ce48f0363962344d55e0859fb950f3f0641bb3c8cc5a3673fbd6ced7f835fe51bdce76a9c9a3a43ff35e1ced8218147faae87d147
-  data.tar.gz: 34be9722e4a6d4993c749184e0fa7e923ab878ad34a7678612dccba3ca7dc66fd23f0435d658821dbfd47b43292de20f33808bfb299d3dd7a69b7c167ea32058
+  metadata.gz: da385e4e6c2b71bf348722fc41268295af80f4b6956f5f9a9d2dd1aa7d9e4007a1db09624df71d131576d859c1ff232badab35d0215f7e9da09c85bf5067e70f
+  data.tar.gz: d4d5166a02c894ffe507e5dd0edab32b2aa07c93e942da1fabda2206b52bd60510252a0fe9d6b14f611ef23c8a90e0220fce808494923f3b20fe2af1856cde09

data/lib/misty/auth/token/v3.rb

@@ -47,15 +47,17 @@ module Misty
 
         def set_credentials(auth)
           if auth[:project_id] || auth[:project]
-            if auth[:project_domain_id].nil? && auth[:project_domain].nil?
-              project_domain_id = DOMAIN_ID
+            @project = Misty::Auth::ProjectScope.new(auth[:project_id], auth[:project])
+
+            if auth[:project_domain_id] || auth[:project_domain]
+              @project.domain = Misty::Auth::Name.new(auth[:project_domain_id], auth[:project_domain])
             else
-              project_domain_id = auth[:project_domain_id] if auth[:project_domain_id]
-              project_domain = auth[:project_domain] if auth[:project_domain]
+              if auth[:domain_id] || auth[:domain]
+                @project.domain = Misty::Auth::Name.new(auth[:domain_id], auth[:domain])
+              else
+                @project.domain = Misty::Auth::Name.new(DOMAIN_ID, nil)
+              end
             end
-
-            @project = Misty::Auth::ProjectScope.new(auth[:project_id], auth[:project])
-            @project.domain = Misty::Auth::Name.new(project_domain_id, auth[:project_domain])
           else
             # scope: domain
             if auth[:domain_id] || auth[:domain]
@@ -70,16 +72,17 @@ module Misty
             @token = auth[:token]
           else
             @user = Misty::Auth::User.new(auth[:user_id], auth[:user])
+            @user.password = auth[:password]
 
-            if auth[:user_domain_id].nil? && auth[:user_domain].nil?
-              user_domain_id = DOMAIN_ID
+            if auth[:user_domain_id] || auth[:user_domain]
+              @user.domain = Misty::Auth::Name.new(auth[:user_domain_id], auth[:user_domain])
             else
-              user_domain_id = auth[:user_domain_id] if auth[:user_domain_id]
-              user_domain = auth[:user_domain] if auth[:user_domain]
+              if auth[:domain_id] || auth[:domain]
+                @user.domain = Misty::Auth::Name.new(auth[:domain_id], auth[:domain])
+              else
+                @user.domain = Misty::Auth::Name.new(DOMAIN_ID, nil)
+              end
             end
-
-            @user.domain = Misty::Auth::Name.new(user_domain_id, user_domain)
-            @user.password = auth[:password]
           end
 
           credentials

data/lib/misty/openstack/api/keystone/v3.rb

@@ -14,7 +14,7 @@ module Misty
           include Misty::Openstack::Extension
 
           def service_types
-            %w(identity)
+            %w(identity identityv3)
           end
         end
       end

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json