opennebula 5.11.80.pre → 5.11.85.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2d83b29c5331f619c3b5aa1213b82f3e078663
-  data.tar.gz: bc41b7188c837d471cec3644d6a8aa780b60b4bd
+  metadata.gz: f7c0463980bb481a313fecfe5d21893587dfddcb
+  data.tar.gz: f73c74b057353fa3bd81e33271f51ad7093fb2e2
 SHA512:
-  metadata.gz: c20c193b8023d56b1a5c3d44a1468a0d9c90bc0d4f234f451a6e8f9a1444d0bfc6fc2e85d40763cf82fac95ab833167c03b8f212b81e5feb9a991057e81c9d82
-  data.tar.gz: 6b57f21dad920d7fe9d159d2cc46d9e55f50b8fbf8063790d2fd48ebbd75d6aade3051f7d0902e40764f95d632b938a2de2ac1058b490c0b290b4d5520fbb6cc
+  metadata.gz: f940626641eea5bb9d66aa1b5aa45a89b9c6e870173104308a30e53c52eed979777978acb23dd0094b746f7dbca26a59b4dd3a4fba1a0b930ec54969852e2c5e
+  data.tar.gz: 17f00e8678bca2183a3f897ff3705220cc5d8bc8ba5b36955fc85f081b0aeac11bfda3abeba6f0da68bd0539da7222205bffa3b4e2043ef723bae706a2e0b65c

data/lib/OpenNebulaDriver.rb

@@ -97,7 +97,7 @@ class OpenNebulaDriver < ActionManager
         command = action_command_line(aname, params, options[:script_name])
 
         if action_is_local?(aname)
-            stdin = Base64.strict_encode64(options[:stdin])
+            stdin = Base64.strict_encode64(options[:stdin].to_s)
             execution = LocalCommand.run(command,
                                          log_method(id),
                                          stdin,

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.11.80'
+    VERSION = '5.11.85'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula.rb

@@ -74,5 +74,5 @@ require 'opennebula/hook_log'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.11.80'
+    VERSION = '5.11.85'
 end

data/lib/opennebula/host.rb

@@ -239,7 +239,8 @@ module OpenNebula
                 vi_client = VCenterDriver::VIClient.new_from_host(self["ID"])
                 importer  = VCenterDriver::VmmImporter.new(@client, vi_client)
 
-                return importer.import({wild: wild, template: template, one_item: vm, host: self['ID']})
+                return importer.import({wild: wild, template: template,
+                                        one_item: vm, host: self['ID']})
             else
                 rc = vm.allocate(template)
 

data/lib/opennebula/ldap_auth.rb

@@ -64,9 +64,8 @@ class OpenNebula::LdapAuth
             }
         end
 
-        if !@options[:rfc2307bis]
-            @options[:attributes] << @options[:user_field]
-        end
+        # always fetch user_filed to compare whitespace diff
+        @options[:attributes] << @options[:user_field]
 
         # fetch the user group field only if we need that
         if @options[:group] or !@options[:rfc2307bis]
@@ -143,15 +142,20 @@ class OpenNebula::LdapAuth
 
         if result && result.first
             @user = result.first
-            [@user.dn, @user[@options[:user_group_field]]]
+
+            [@user.dn,
+             @user[@options[:user_field]].first,
+             @user[@options[:user_group_field]]]
         else
             result=@ldap.search(:base => name)
 
             if result && result.first
                 @user = result.first
-                [name, @user[@options[:user_group_field]]]
+                [name,
+                 @user[@options[:user_field]].first,
+                 @user[@options[:user_group_field]]]
             else
-                [nil, nil]
+                [nil, nil, nil]
             end
         end
     end

data/lib/opennebula/marketplaceapp.rb

@@ -192,8 +192,9 @@ module OpenNebula
             options[:vmtemplate_name] = name unless options[:vmtemplate_name]
 
             tmpl << "\n"
-            tmpl << "NAME=\"" << name << "\"\n"
-            tmpl << "FROM_APP=\"" << self['ID'] << "\"\n"
+            tmpl << 'NAME="' << name << "\"\n"
+            tmpl << 'FROM_APP="' << self['ID'] << "\"\n"
+            tmpl << 'URL_ARGS="' << options[:url_args] << "\"\n" if options[:url_args]
 
             case type_str
             when 'IMAGE'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.11.80.pre
+  version: 5.11.85.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri