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

F #~: fix problems with marketplaceapp in vCenter (#1041)

Browse Source 
Signed-off-by: Carlos Herrera <cherrera@opennebula.io>
This commit is contained in:
Carlos J. Herrera 2021-03-29 17:15:28 -04:00 committed by GitHub
parent 0dcde4b04b
commit e268031974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/onemarketapp
View File

@ -45,9 +45,6 @@ require 'one_helper/onemarketapp_helper'
require 'one_helper/onemarket_helper'
require 'one_helper/onedatastore_helper'
require 'vcenter_driver'
CONFIG = VCenterConf.new
CommandParser::CmdParser.new(ARGV) do
usage '`onemarket` <command> [<args>] [<options>]'
version OpenNebulaHelper::ONE_VERSION
@ -287,8 +284,7 @@ CommandParser::CmdParser.new(ARGV) do
:vmtemplate_name => options[:vmname],
:url_args => tag,
:notemplate => options[:no] == 'no',
:template => options[:template],
:default_template => CONFIG[:default_template]
:template => options[:template]
)
if OpenNebula.is_error?(rc)

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

@ -155,6 +155,31 @@ module OpenNebula::MarketPlaceAppExt
is_vcenter = !OpenNebula.is_error?(rc) &&
(ds['TEMPLATE/DRIVER'] == 'vcenter')
if is_vcenter && options[:template].nil?
vcenterrc_path =
"#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"
if File.file?(vcenterrc_path)
config_vcenter = YAML.load_file(vcenterrc_path)
if config_vcenter.key?(:default_template)
options[:template] =
config_vcenter[:default_template]
else
raise "Couldn't find default_template " \
'configuration in vcenterrc conf ' \
'file. Please use the --template ' \
'file to define a VM Template ID if ' \
'needed or add default_template to' \
' vcenterrc conf file'
end
else
raise "Couldn't find vcenterrc conf file. " \
' Please use the --template file to define' \
' a VM Template ID if needed.'
end
end
#---------------------------------------------------------------
# Allocate the image in OpenNebula
#---------------------------------------------------------------
@ -188,8 +213,8 @@ module OpenNebula::MarketPlaceAppExt
if !options[:template].nil?
template_id = options[:template]
if template_id == -1
template_id = options[:default_template]
if template_id < 0
raise 'Invalid option, template_id must be a valid ID'
end
template = Template.new_with_id(template_id, @client)