shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-31 01:47:11 +03:00
Code Releases Wiki Activity

F OpenNebula/one#6258: Fix Turnkey defaults (#2658)

Browse Source
This commit is contained in:
Daniel Clavijo Coca 2023-07-03 08:40:36 -06:00 committed by GitHub
parent 9465673c4e
commit 90585e42cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/market_mad/remotes/turnkeylinux/monitor
View File

@ -67,12 +67,16 @@ class TurnkeyLinux
# Default Configuration parameters for the Driver
#---------------------------------------------------------------------------
DEFAULTS = {
:url => 'http://mirror.turnkeylinux.org',
:platform => '/turnkeylinux/images/proxmox/',
:sizemb => 5120,
:fs => 'ext4',
:format => 'raw',
:agent => 'OpenNebula'
:url => 'http://mirror.turnkeylinux.org',
:platform => '/turnkeylinux/images/proxmox/',
:sizemb => 5120,
:fs => 'ext4',
:format => 'raw',
:agent => 'OpenNebula',
:memory => '768',
:cpu => 1,
:vcpu => 2,
:privileged => true
}
#---------------------------------------------------------------------------
@ -182,7 +186,7 @@ class TurnkeyLinux
print_var(tmpl64, 'DRIVER', 'raw')
data = { 'APPTEMPLATE64' => tmpl64,
'VMTEMPLATE64' => LXDMarket.template }
'VMTEMPLATE64' => LXDMarket.template(@options) }
data.each do |key, val|
print_var(tmpl, key, Base64.strict_encode64(val))
end
@ -226,10 +230,20 @@ begin
doc = REXML::Document.new(drv_message).root
set_option(options, doc, :url, 'MARKETPLACE/TEMPLATE/ENDPOINT')
set_option(options, doc, :sizemb, 'MARKETPLACE/TEMPLATE/IMAGE_SIZE_MB')
set_option(options, doc, :fs, 'MARKETPLACE/TEMPLATE/FILESYSTEM')
set_option(options, doc, :format, 'MARKETPLACE/TEMPLATE/FORMAT')
pre = 'MARKETPLACE/TEMPLATE'
data = {
:url => "#{pre}/ENDPOINT",
:sizemb => "#{pre}/IMAGE_SIZE_MB",
:fs => "#{pre}/FILESYSTEM",
:format => "#{pre}/FORMAT",
:memory => "#{pre}/MEMORY",
:cpu => "#{pre}/CPU",
:vcpu => "#{pre}/VCPU",
:privileged => "#{pre}/PRIVILEGED"
}
data.each {|key, value| set_option(options, doc, key, value) }
rc, str = TurnkeyLinux.new(options).appliances