openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Remove default for nova_console_keymap

Browse Source 
Setting the nova_console_keymap variable to 'en-us' breaks the
keyboard input for novnc consoles. It's recommended to let vnc
automatically select the correct keymap.

This patch removes the keymap variables from the `nova.conf`
templates and their default values.

Closes-bug: 1691791
Change-Id: I049ad6db2198dc8d0fae04160486c5ba6f7f36f1
This commit is contained in:
Major Hayden
2017-05-18 13:39:37 -05:00
parent 9d591764f3
commit 385d03cf20
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@@ -221,7 +221,6 @@ nova_spice_html5proxy_base_proto: "{{ openstack_service_publicuri_proto | defaul
nova_spice_html5proxy_base_port: 6082 nova_spice_html5proxy_base_port: 6082
nova_spice_html5proxy_base_uri: "{{ nova_spice_html5proxy_base_proto }}://{{ external_lb_vip_address }}:{{ nova_spice_html5proxy_base_port }}" nova_spice_html5proxy_base_uri: "{{ nova_spice_html5proxy_base_proto }}://{{ external_lb_vip_address }}:{{ nova_spice_html5proxy_base_port }}"
nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto.html" nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto.html"
nova_spice_console_keymap: "{{ nova_console_keymap }}"
nova_spice_console_agent_enabled: True nova_spice_console_agent_enabled: True
nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5 nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5
nova_spicehtml5_git_install_branch: master nova_spicehtml5_git_install_branch: master
@@ -236,7 +235,6 @@ nova_novncproxy_vncserver_listen: "{{ ansible_host }}"
nova_novncproxy_agent_enabled: True nova_novncproxy_agent_enabled: True
nova_novncproxy_git_repo: https://github.com/kanaka/novnc nova_novncproxy_git_repo: https://github.com/kanaka/novnc
nova_novncproxy_git_install_branch: master nova_novncproxy_git_install_branch: master
nova_novncproxy_vnc_keymap: "{{ nova_console_keymap }}"
## Nova metadata ## Nova metadata
nova_metadata_proxy_enabled: "{{ nova_network_services[nova_network_type]['metadata_proxy_enabled'] | bool }}" nova_metadata_proxy_enabled: "{{ nova_network_services[nova_network_type]['metadata_proxy_enabled'] | bool }}"
@@ -299,7 +297,6 @@ nova_libvirt_hw_disk_discard: '{{ nova_libvirt_images_rbd_pool is defined | tern
## Nova console ## Nova console
nova_console_agent_enabled: True nova_console_agent_enabled: True
nova_console_keymap: en-us
# Set the console type. Presently the only options are ["spice", "novnc"]. # Set the console type. Presently the only options are ["spice", "novnc"].
nova_console_type: spice nova_console_type: spice

13
releasenotes/notes/remove-console-keymap-ae255da81979a3a5.yaml Normal file
View File

@@ -0,0 +1,13 @@
---
deprecations:
- |
The upstream noVNC developers recommend that the keymap be automatically
detected for virtual machine consoles. Three Ansible variables have been
removed:
* nova_console_keymap
* nova_novncproxy_vnc_keymap
* nova_spice_console_keymap
Deployers can still set a specific keymap using a nova configuration
override if necessary.

2
templates/nova.conf.j2
View File

@@ -119,7 +119,6 @@ os_region_name = {{ nova_service_region }}
[spice] [spice]
agent_enabled = {{ nova_console_agent_enabled }} agent_enabled = {{ nova_console_agent_enabled }}
enabled = {{ nova_console_agent_enabled }} enabled = {{ nova_console_agent_enabled }}
keymap = {{ nova_spice_console_keymap }}
# Console Url and binds # Console Url and binds
html5proxy_base_url = {{ nova_spice_html5proxy_base_url }} html5proxy_base_url = {{ nova_spice_html5proxy_base_url }}
server_listen = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %} server_listen = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
@@ -133,7 +132,6 @@ enabled = False
{% elif nova_console_type == 'novnc' %} {% elif nova_console_type == 'novnc' %}
[vnc] [vnc]
enabled = {{ nova_novncproxy_agent_enabled }} enabled = {{ nova_novncproxy_agent_enabled }}
keymap = {{ nova_novncproxy_vnc_keymap }}
novncproxy_base_url = {{ nova_novncproxy_base_url }} novncproxy_base_url = {{ nova_novncproxy_base_url }}
vncserver_listen = {{ nova_novncproxy_vncserver_listen }} vncserver_listen = {{ nova_novncproxy_vncserver_listen }}
vncserver_proxyclient_address = {{ nova_novncproxy_vncserver_proxyclient_address }} vncserver_proxyclient_address = {{ nova_novncproxy_vncserver_proxyclient_address }}