shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-08 20:58:17 +03:00
Code Releases Wiki Activity

B #5812: fix bug when exporting service tmpl (#2001)

Browse Source 
(cherry picked from commit ff367ca2d669abbc9d9cd3fd08bbc22c47cb69b2)
This commit is contained in:
Alejandro Huertas Herrero 2022-05-03 18:20:19 +02:00 committed by Tino Vazquez
parent 438b182295
commit ac9bb1ebe6
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/oca/ruby/opennebula/marketplaceapp_ext.rb
View File

@ -460,7 +460,11 @@ module OpenNebula::MarketPlaceAppExt
end
if !options[:template] || options[:template] == -1
vmtpl = create_vcenter_template(ds, options)
vmtpl = create_vcenter_template(
ds,
options,
self['TEMPLATE/VMTEMPLATE64']
)
else
template_id = options[:template]
template = Template.new_with_id(template_id, @client)
@ -676,7 +680,8 @@ module OpenNebula::MarketPlaceAppExt
"Error deleting template #{id}"]
}
delete_method = 'delete(true)'
delete_method = 'delete'
args = true
else
obj_factory = lambda {|v|
id = v[:image].first
@ -690,7 +695,13 @@ module OpenNebula::MarketPlaceAppExt
exported.each do |_, v|
obj, err_msg = obj_factory.call(v)
next unless OpenNebula.is_error?(obj.send(delete_method))
if args
rc = obj.send(delete_method, args)
else
rc = obj.send(delete_method)
end
next unless OpenNebula.is_error?(rc)
ret << err_msg
end