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

feature #2248: add password and listen parameters to VNC and spice

Browse Source
This commit is contained in:
Javi Fontan 2013-08-21 12:41:04 +02:00
parent 28918af2a3
commit 68e413c27c
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/cli/one_helper.rb
View File

@ -186,11 +186,37 @@ EOT
:large => '--vnc',
:description => 'Add VNC server to the VM'
},
{
:name => 'vnc_password',
:large => '--vnc-password password',
:format => String,
:description => 'VNC password'
},
{
:name => 'vnc_listen',
:large => '--vnc-listen ip',
:format => String,
:description => 'VNC IP where to listen for connections. '<<
'By default is 0.0.0.0 (all interfaces).'
},
{
:name => 'spice',
:large => '--spice',
:description => 'Add spice server to the VM'
},
{
:name => 'spice_password',
:large => '--spice-password password',
:format => String,
:description => 'spice password'
},
{
:name => 'spice_listen',
:large => '--spice-listen ip',
:format => String,
:description => 'spice IP where to listen for connections. '<<
'By default is 0.0.0.0 (all interfaces).'
},
{
:name => 'ssh',
:large => '--ssh [file]',
@ -818,11 +844,21 @@ EOT
end
if options[:vnc]
template<<'GRAPHICS=[ TYPE="vnc", LISTEN="0.0.0.0" ]'<<"\n"
vnc_listen=options[:vnc_listen] || "0.0.0.0"
template<<"GRAPHICS=[ TYPE=\"vnc\", LISTEN=\"#{vnc_listen}\""
if options[:vnc_password]
template << ", PASSWD=\"#{options[:vnc_password]}\""
end
template<<' ]'<<"\n"
end
if options[:spice]
template<<'GRAPHICS=[ TYPE="spice", LISTEN="0.0.0.0" ]'<<"\n"
spice_listen=options[:spice_listen] || "0.0.0.0"
template<<"GRAPHICS=[ TYPE=\"spice\", LISTEN=\"#{spice_listen}\""
if options[:spice_password]
template << ", PASSWD=\"#{options[:spice_password]}\""
end
template<<' ]'<<"\n"
end
context=create_context(options)