diff --git a/defaults/main.yml b/defaults/main.yml index b9510828..890e1a96 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -221,7 +221,6 @@ nova_spice_html5proxy_base_proto: "{{ openstack_service_publicuri_proto | defaul 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_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto.html" -nova_spice_console_keymap: "{{ nova_console_keymap }}" nova_spice_console_agent_enabled: True nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5 nova_spicehtml5_git_install_branch: master @@ -236,7 +235,6 @@ nova_novncproxy_vncserver_listen: "{{ ansible_host }}" nova_novncproxy_agent_enabled: True nova_novncproxy_git_repo: https://github.com/kanaka/novnc nova_novncproxy_git_install_branch: master -nova_novncproxy_vnc_keymap: "{{ nova_console_keymap }}" ## Nova metadata 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_agent_enabled: True -nova_console_keymap: en-us # Set the console type. Presently the only options are ["spice", "novnc"]. nova_console_type: spice diff --git a/releasenotes/notes/remove-console-keymap-ae255da81979a3a5.yaml b/releasenotes/notes/remove-console-keymap-ae255da81979a3a5.yaml new file mode 100644 index 00000000..3f34fa32 --- /dev/null +++ b/releasenotes/notes/remove-console-keymap-ae255da81979a3a5.yaml @@ -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. diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index a971627c..f8f485c3 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -119,7 +119,6 @@ os_region_name = {{ nova_service_region }} [spice] agent_enabled = {{ nova_console_agent_enabled }} enabled = {{ nova_console_agent_enabled }} -keymap = {{ nova_spice_console_keymap }} # Console Url and binds html5proxy_base_url = {{ nova_spice_html5proxy_base_url }} 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' %} [vnc] enabled = {{ nova_novncproxy_agent_enabled }} -keymap = {{ nova_novncproxy_vnc_keymap }} novncproxy_base_url = {{ nova_novncproxy_base_url }} vncserver_listen = {{ nova_novncproxy_vncserver_listen }} vncserver_proxyclient_address = {{ nova_novncproxy_vncserver_proxyclient_address }}