diff options
| author | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-05-17 01:00:16 +0900 |
|---|---|---|
| committer | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-05-17 01:00:16 +0900 |
| commit | d44299be90bbfcac5f8de1e1264b81fbb0bfa5e2 (patch) | |
| tree | 21bfc448de99f49446f2bdddf984e2b928e504be | |
| parent | 8d8076ff87e988f40c9ee3a24b7c3963064921bd (diff) | |
| download | nova-d44299be90bbfcac5f8de1e1264b81fbb0bfa5e2.tar.gz nova-d44299be90bbfcac5f8de1e1264b81fbb0bfa5e2.tar.xz nova-d44299be90bbfcac5f8de1e1264b81fbb0bfa5e2.zip | |
Add vnc_keymap flag and enable setting keymap for vnc console.
| -rw-r--r-- | nova/virt/libvirt.xml.template | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 1 | ||||
| -rw-r--r-- | nova/vnc/__init__.py | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template index de2497a76..20986d4d5 100644 --- a/nova/virt/libvirt.xml.template +++ b/nova/virt/libvirt.xml.template @@ -116,7 +116,7 @@ </serial> #if $getVar('vncserver_host', False) - <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vncserver_host}'/> + <graphics type='vnc' port='-1' autoport='yes' keymap='${vnc_keymap}' listen='${vncserver_host}'/> #end if </devices> </domain> diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 555e44ce2..7552c9488 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -1022,6 +1022,7 @@ class LibvirtConnection(driver.ComputeDriver): if FLAGS.vnc_enabled: if FLAGS.libvirt_type != 'lxc': xml_info['vncserver_host'] = FLAGS.vncserver_host + xml_info['vnc_keymap'] = FLAGS.vnc_keymap if not rescue: if instance['kernel_id']: xml_info['kernel'] = xml_info['basepath'] + "/kernel" diff --git a/nova/vnc/__init__.py b/nova/vnc/__init__.py index b5b00e44e..859bfd65f 100644 --- a/nova/vnc/__init__.py +++ b/nova/vnc/__init__.py @@ -32,3 +32,5 @@ flags.DEFINE_string('vncserver_host', '0.0.0.0', 'the host interface on which vnc server should listen') flags.DEFINE_bool('vnc_enabled', True, 'enable vnc related features') +flags.DEFINE_string('vnc_keymap', 'en-us', + 'keymap for vnc') |