openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Fixed confusing console keymap variables

Browse Source 
Change-Id: I72f3d0b85c4dd43aa3f89ee0d001c344d8928e10
Closes-Bug: #1651359
This commit is contained in:
Adrien Cunin
2016-12-20 10:11:45 +01:00
parent 167fe1b74a
commit 8f8a6b6507
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@@ -200,7 +200,7 @@ 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: en-us 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
@@ -215,7 +215,7 @@ 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: en-us 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 }}"

2
templates/nova.conf.j2
View File

@@ -156,7 +156,7 @@ 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_console_keymap }} 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 %}