Ensure that novnc/spice consoles use the public endpoint protocol
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
(cherry picked from commit 8fc0304b66
)
This commit is contained in:
parent
38f9ed31f7
commit
27d42de97d
|
@ -195,7 +195,7 @@ nova_program_name: nova-api-os-compute
|
|||
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"
|
||||
|
@ -206,7 +206,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"
|
||||
|
|
Loading…
Reference in New Issue