From 8fc0304b6616bc738e25cdb7ee84fa302b7a1aef Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 10 Oct 2016 10:09:29 +0100 Subject: [PATCH] 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 --- defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 03afd290..b3315c79 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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"