openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Ensure that novnc/spice consoles use the public endpoint protocol

Browse Source 
When using HTTPS as the public endpoint protocol, the novnc/spice
console endpoint provided must also be HTTPS.

This patch ensures that the novnc/spice console endpoint keys off
the general OpenStack service protocol set for the public endpoints.

It still remains possible to override the endpoint protocol, if
necessary.

Closes-Bug: #1630950
Closes-Bug: #1630953
Change-Id: If3c751adfc4cb74c3230db1c8d4f1c9c3672bea8
This commit is contained in:
Jesse Pretorius 2016-10-10 10:09:29 +01:00 committed by Jesse Pretorius (odyssey4me)
parent eed7b6b51d
commit 8fc0304b66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -194,7 +194,7 @@ nova_service_internalurl: "{{ nova_service_internaluri }}/v2.1/%(tenant_id)s"
nova_cross_az_attach: True
## Nova spice
nova_spice_html5proxy_base_proto: http
nova_spice_html5proxy_base_proto: "{{ openstack_service_publicuri_proto | default('http') }}"
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"
@ -204,7 +204,7 @@ nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5
nova_spicehtml5_git_install_branch: master
## Nova novnc
nova_novncproxy_proto: http
nova_novncproxy_proto: "{{ openstack_service_publicuri_proto | default('http') }}"
nova_novncproxy_port: 6080
nova_novncproxy_base_uri: "{{ nova_novncproxy_proto }}://{{ external_lb_vip_address }}:{{ nova_novncproxy_port }}"
nova_novncproxy_base_url: "{{ nova_novncproxy_base_uri }}/vnc_auto.html"