occi-api 4.3.0.beta.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c39ff422b601e3adbb406dbcdcfa4e7b0d3477f
-  data.tar.gz: 89d1677c49f3f69f38942347c2a36568bd8b87f0
+  metadata.gz: 644617fdb432b4b461d7041aac940ee18c00c4e6
+  data.tar.gz: 2b23339314d565dd67791897b17370826bebe724
 SHA512:
-  metadata.gz: 04278ffe962784a436d98d5c710dac9567e1c006c502bdb4537f578afa2bf7e0fa8d89a21c3dd9ac505d5e47c3fe826a3ea8fc4be0b9611a5e5ddaeca1dc9ae0
-  data.tar.gz: 8a63832a4542feb7c19ede688a7c6b62740db7d738f9962a7088936de89c66bc2ab0e91b4d7d5f0e86040c330b2a9d220d5c92f1d35eeb13ff2e69c26e32044e
+  metadata.gz: 46ba1864b6ccbcc728ac8f73239b100d8c63715587b1d89c5f9bd13fb48a63be677eefa6294886047f6798220754178dfd840e8e323679295e5c48cab69535f9
+  data.tar.gz: e9bd93d055809ea21875c5bc73b93002f1aa8fe6c0bef6c281814d99a5a0c8485af034cc980d07df3f5963d2789fb4012d27383847a8e7abf73037c2a211a16c

data/lib/occi/api/client/http/authn_plugins/keystone.rb

@@ -10,12 +10,15 @@ module Occi::Api::Client
           # get Keystone URL if possible
           set_keystone_base_url
 
-          # get an un-scoped token
-          set_auth_token
-
-          # use the un-scoped token for tenant discovery
-          # and get a scoped token
-          get_prefered_tenant
+          if !ENV['ROCCI_CLIENT_KEYSTONE_TENANT'].blank?
+            # get a scoped token for the specified tenant directly
+            set_auth_token ENV['ROCCI_CLIENT_KEYSTONE_TENANT']
+          else
+            # get an unscoped token, use the unscoped token
+            # for tenant discovery and get a scoped token
+            set_auth_token
+            get_first_working_tenant
+          end
 
           raise ::Occi::Api::Client::Errors::AuthnError,
                 "Unable to get a tenant from Keystone, fallback failed!" if @env_ref.class.headers['X-Auth-Token'].blank?
@@ -94,7 +97,7 @@ module Occi::Api::Client
           body.to_json
         end
 
-        def get_prefered_tenant(match = nil)
+        def get_first_working_tenant
           response = @env_ref.class.get(
             "#{@keystone_url}/v2.0/tenants",
             :headers => get_req_headers

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.3.0.beta.3" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.3.0" unless defined?(::Occi::Api::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.3.0.beta.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
@@ -229,9 +229,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2