openstack 3.3.20 → 3.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: debdb7d7303491f3a60efcead2419e5c3985abbb
-  data.tar.gz: 9c656102a3bfb2657e4fbf38791ee1b04b5a655b
+SHA256:
+  metadata.gz: 46a9c965563f1fa6e8adcf4a04a6a0c59a5b53424be6728148cf27daac9eeb58
+  data.tar.gz: ce173fe173885f4257fca464603fc6349253b35d4216686eb14c1fbe98140fe8
 SHA512:
-  metadata.gz: 55d1a0422eb6a190328563eb7efc7445f825a13a4a67220e8283f662aefb19a1f92b4fd28584ee538fb140318366a4c79107c734837ae2c8679a7aa6f3f3e039
-  data.tar.gz: bd96bf489a20c47f2ee42d9553ae66382ff626b6aaa0d2e0a3eff773762b12d22b2e8b9ca153097dc3bcf3ee2c03b2da10c7d866838e25d11a719e31abb07e15
+  metadata.gz: 4d04758eb38abdec9ce355de00ee0726d5279268669ceb9a63f5d1b4db565b84d5c919bb8e24cf3afcd924cfddf3624f4bf6448fcdb2a7dc4788406aae36b97a
+  data.tar.gz: b011b062002c5f6e42bf69cd0b498bf805cb99e926542926b7d31ae3d025ad7b1bbe93c7921190d35495cd5994d2c1be6463246197db0c302cffcb509c12906f

data/VERSION

@@ -1 +1 @@
-3.3.20
+3.3.21

data/lib/openstack/connection.rb

@@ -36,10 +36,12 @@ class Connection
     attr_reader   :ssl_version
     attr_reader   :region
     attr_reader   :regions_list #e.g. os.connection.regions_list == {"region-a.geo-1" => [ {:service=>"object-store", :versionId=>"1.0"}, {:service=>"identity", :versionId=>"2.0"}], "region-b.geo-1"=>[{:service=>"identity", :versionId=>"2.0"}] }
+    attr_reader   :force_https
 
     attr_reader   :http
     attr_reader   :is_debug
     attr_reader   :endpoint_type
+    attr_reader   :random_endpoint
 
     # Creates and returns a new Connection object, depending on the service_type
     # passed in the options:
@@ -78,6 +80,9 @@ class Connection
     #   :ssl_version - explicitly set an version (:SSLv3 etc, see  OpenSSL::SSL::SSLContext::METHODS)
     #   :is_debug - Only for development purpose for debug output
     #   :endpoint_type - Type of endpoint. Optional. 'publicURL', 'internalURL', 'adminURL'
+    #   :random_endpoint - (Optional for v3.0 auth only). Select random endpoint from the list provided by the
+    #     auth endpoint to distribute load between endpoints. Defaults to false
+    #   :force_https - Force HTTPS for all connections.
     #
     # The options hash is used to create a new OpenStack::Connection object
     # (private constructor) and this is passed to the constructor of OpenStack::Compute::Connection
@@ -139,7 +144,7 @@ class Connection
       raise Exception::InvalidArgument, "Invalid :auth_url parameter." if auth_uri.nil? or auth_uri.host.nil?
       @auth_host = auth_uri.host
       @auth_port = auth_uri.port
-      @auth_scheme = auth_uri.scheme
+      @auth_scheme = options[:force_https] ? 'https' : auth_uri.scheme
       @auth_path = auth_uri.path
       @retry_auth = options[:retry_auth]
       @proxy_host = options[:proxy_host]
@@ -151,6 +156,8 @@ class Connection
       @quantum_version = 'v2.0' if @service_type == 'network'
       @quantum_version = 'v2' if @service_type == 'metering'
       @endpoint_type = options[:endpoint_type] || "publicURL"
+      @random_endpoint = options[:random_endpoint] || false
+      @force_https = options[:force_https] || false
       @semaphore = Mutex.new
     end
 
@@ -365,7 +372,7 @@ class Connection
         puts "Can't connect to the server: #{tries} tries  to reconnect" if connection.is_debug
         sleep time += 1
         retry unless (tries -= 1) <= 0
-        raise OpenStack::Exception::Connection, "Unable to connect to #{server}"
+        raise OpenStack::Exception::Connection, "Unable to connect to #{connection.proxy_host}"
       end
 
       response = server.get(connection.auth_path, hdrhash)
@@ -382,7 +389,7 @@ class Connection
         connection.service_host = uri.host
         connection.service_path = uri.path
         connection.service_port = uri.port
-        connection.service_scheme = uri.scheme
+        connection.service_scheme = connection.force_https ? 'https' : uri.scheme
         connection.authok = true
       else
         connection.authok = false
@@ -420,7 +427,7 @@ class Connection
         puts "Can't connect to the server: #{tries} tries  to reconnect" if connection.is_debug
         sleep time += 1
         retry unless (tries -= 1) <= 0
-        raise OpenStack::Exception::Connection, "Unable to connect to  #{server}"
+        raise OpenStack::Exception::Connection, "Unable to connect to  #{connection.proxy_host}"
       end
 
       @uri = String.new
@@ -478,7 +485,7 @@ class Connection
               connection.service_host = @uri.host
               connection.service_path = @uri.path
               connection.service_port = @uri.port
-              connection.service_scheme = @uri.scheme
+              connection.service_scheme = connection.force_https ? 'https' : @uri.scheme
               connection.authok = true
             end
           end
@@ -532,7 +539,7 @@ class Connection
         puts "Can't connect to the server: #{tries} tries to reconnect" if connection.is_debug
         sleep time += 1
         retry unless (tries -= 1) <= 0
-        raise OpenStack::Exception::Connection, "Unable to connect to #{server}"
+        raise OpenStack::Exception::Connection, "Unable to connect to #{connection.proxy_host}"
       end
 
       # Build Auth JSON
@@ -614,13 +621,13 @@ class Connection
             interface_type = connection.endpoint_type.gsub('URL','')
             endpoints = endpoints.select {|ep| ep['interface'] == interface_type}
 
-            # Select endpoint based on region
+            # filter endpoints by region
             if connection.region
-              endpoints.each do |ep|
-                if ep["region"] and ep["region"].upcase == connection.region.upcase
-                  @uri = URI.parse(ep['url'])
-                end
-              end
+              endpoints = endpoints.select {|ep| ep["region"] and ep["region"].upcase == connection.region.upcase}
+            end
+
+            if connection.random_endpoint
+              @uri = URI.parse(endpoints.sample['url'])
             else
               @uri = URI.parse(endpoints[0]['url'])
             end
@@ -631,7 +638,7 @@ class Connection
               connection.service_host = @uri.host
               connection.service_path = @uri.path
               connection.service_port = @uri.port
-              connection.service_scheme = @uri.scheme
+              connection.service_scheme = connection.force_https ? 'https' : @uri.scheme
               connection.authok = true
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 3.3.20
+  version: 3.3.21
 platform: ruby
 authors:
 - Dan Prince
@@ -137,8 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OpenStack Ruby API