fog-openstack 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b30f652b4b6df666a43ce5d8a5df9e999062ea3
-  data.tar.gz: b0ef11fb9333c0987ae31ecead2c2f99ddf107a6
+  metadata.gz: dd7c2060dd814a7a8348163937e8a1912789a29e
+  data.tar.gz: f5cd9bd84435b5502f0cc416c2aa98c24f4137fe
 SHA512:
-  metadata.gz: b96108935e442c7667530a689be9911a55a1c5d137b0072e322af3c47140e9fb1cdbae3f679838bda873169f719e84521bd08cef8b94ca9bf23d078f18e36e7d
-  data.tar.gz: 3b95ad280e133a331c803e7fd9b5daf3632085fa1ee0c05304cf9202e957a38a223c5eabe2752c4a81354483877ba6ff8aea8c45b81b885205b41e17e0f285f2
+  metadata.gz: 04d8c75eaa4931ad90290faadab052593a9ad9948876499b440273d278c4cc2e5a7f0aa6e5ecad30cb4eeed6d8dae7cff3453b4c6570bea8696b01781c00d867
+  data.tar.gz: 30b7cd277e256ee6a29077ffb74dc107216c84e4f102c7b92dba3ded1e2d33f7499002c0b3e522bf368628e31e14f7881a1a978e17a49aaf715bbaea3c2a8367

data/README.md

@@ -42,12 +42,12 @@ Checklist:
 * All following examples assume that `@connection_params` is a hash of valid connection information for an OpenStack cloud.
 * The `:openstack_username` and `:openstack_api_key` keys must map to a valid user/password combination in Keystone.
 * If you don't know what domain your user belongs to, chances are it's the `default` domain. By default, all users are a member of the `default` domain unless otherwise specified.
-
+* Keystone endpoints are version less. Version 3 is the default as v2.0 is deprecated. Meanwhile Keystone V3 still supports v2.0 for backward compatibility. Therefore passing a tenant instead of a project (along with a domain) makes Keystone provide v2.0 token.
 Connection parameters:
 
 ```ruby
 @connection_params = {
-  openstack_auth_url:     "http://devstack.test:5000/v3/auth/tokens",
+  openstack_auth_url:     "http://devstack.test:5000",
   openstack_username:     "admin",
   openstack_api_key:      "password",
   openstack_project_name: "admin",
@@ -55,14 +55,15 @@ Connection parameters:
 }
 ```
 
-If you're using Keystone V2, you don't need to supply domain details but ensure the `openstack_auth_url` parameter references the correct endpoint.
+If you're using Keystone V2, you don't need to supply domain details but ensure to either provide a tenant name (`openstack_tenant`)
+or a tenant id (`openstack_tenant_id`). Alternatively you can use `:openstack_identity_api_version` parameter with 'v2.0'.
 
 ```ruby
 @connection_params = {
-  openstack_auth_url:     "http://devstack.test:5000/v2.0/tokens",
-  openstack_username:     "admin",
-  openstack_api_key:      "password",
-  openstack_project_name: "admin"
+  openstack_auth_url: "http://devstack.test:5000",
+  openstack_username: "admin",
+  openstack_api_key:  "password",
+  openstack_tenant:   "admin"
 }
 ```
 

data/examples/identity/basics.rb

@@ -3,13 +3,15 @@
 require 'fog/openstack'
 require 'pp'
 
-auth_url = "https://example.net/v2.0/tokens"
+auth_url = "https://example.net"
 username = 'admin@example.net'
 password = 'secret'
+tenant   = 'admin'
 
 keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url,
                                         :openstack_username => username,
-                                        :openstack_api_key  => password
+                                        :openstack_api_key  => password,
+                                        :openstack_tenant   => tenant
                                         # Optional, self-signed certs
                                         #:connection_options => { :ssl_verify_peer => false }
 

data/examples/identity/basics_v3.rb

@@ -3,14 +3,12 @@
 require 'fog/openstack'
 require 'pp'
 
-auth_url = "https://example.net:35357/v3/auth/tokens"
+auth_url = "https://example.net:35357"
 username = 'admin@example.net'
 password = 'secret'
 project = 'admin'
 domain = 'Default'
 
-
-
 keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url,
                                         :openstack_username => username,
                                         :openstack_api_key  => password,

data/lib/fog/image/openstack/v2/models/image.rb

@@ -190,7 +190,7 @@ module Fog
 
           def patch_attributes_to_add(client_attributes, server_attributes)
             client_attributes.reject do |key, _|
-              server_attributes.key?(key)
+              server_attributes.key?(key) || client_attributes[key].nil?
             end
           end
 

data/lib/fog/openstack/version.rb

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

data/lib/fog/storage/openstack.rb

@@ -77,12 +77,8 @@ module Fog
           @openstack_management_url = options[:openstack_management_url] || 'http://example:8774/v2/AUTH_1234'
 
           @openstack_management_uri = URI.parse(@openstack_management_url)
-
-          @host   = @openstack_management_uri.host
           @path   = @openstack_management_uri.path
           @path.sub!(%r{/$}, '')
-          @port   = @openstack_management_uri.port
-          @scheme = @openstack_management_uri.scheme
         end
 
         def data

data/lib/fog/storage/openstack/requests/get_object_https_url.rb

@@ -38,9 +38,9 @@ module Fog
           raise ArgumentError, "Insufficient parameters specified." unless container && object && expires && method
           raise ArgumentError, "Storage must be instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil?
 
-          scheme = options[:scheme] || @scheme
-          host = options[:host] || @host
-          port = options[:port] || @port
+          scheme = options[:scheme] || @openstack_management_uri.scheme
+          host = options[:host] || @openstack_management_uri.host
+          port = options[:port] || @openstack_management_uri.port
 
           # POST not allowed
           allowed_methods = %w(GET PUT HEAD)

data/lib/fog/storage/openstack/requests/public_url.rb

@@ -18,7 +18,8 @@ module Fog
         private
 
         def url
-          "#{@scheme}://#{@host}:#{@port}#{@path}"
+          "#{@openstack_management_uri.scheme}://#{@openstack_management_uri.host}:"\
+          "#{@openstack_management_uri.port}#{@path}"
         end
       end
 

metadata

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