openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use secure websocket for nova serial console proxy when TLS enabled"

Browse Source
This commit is contained in:
Zuul 2019-09-01 12:47:04 +00:00 committed by Gerrit Code Review
commit 9aceea8ef3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -346,6 +346,7 @@ nova_spicehtml5proxy_listen_port: "{{ nova_spicehtml5proxy_port }}"
nova_serialproxy_fqdn: "{{ kolla_external_fqdn }}" nova_serialproxy_fqdn: "{{ kolla_external_fqdn }}"
nova_serialproxy_port: "6083" nova_serialproxy_port: "6083"
nova_serialproxy_listen_port: "{{ nova_serialproxy_port }}" nova_serialproxy_listen_port: "{{ nova_serialproxy_port }}"
nova_serialproxy_protocol: "{{ 'wss' if kolla_enable_tls_external | bool else 'ws' }}"
octavia_internal_fqdn: "{{ kolla_internal_fqdn }}" octavia_internal_fqdn: "{{ kolla_internal_fqdn }}"
octavia_external_fqdn: "{{ kolla_external_fqdn }}" octavia_external_fqdn: "{{ kolla_external_fqdn }}"

2
ansible/roles/nova/templates/nova.conf.j2
View File

@ -97,7 +97,7 @@ enabled = false
{% if enable_nova_serialconsole_proxy | bool %} {% if enable_nova_serialconsole_proxy | bool %}
[serial_console] [serial_console]
enabled = true enabled = true
base_url = ws://{{ nova_serialproxy_fqdn }}:{{ nova_serialproxy_port }}/ base_url = {{ nova_serialproxy_protocol }}://{{ nova_serialproxy_fqdn }}:{{ nova_serialproxy_port }}/
serialproxy_host = {{ api_interface_address }} serialproxy_host = {{ api_interface_address }}
serialproxy_port = {{ nova_serialproxy_listen_port }} serialproxy_port = {{ nova_serialproxy_listen_port }}
proxyclient_address = {{ api_interface_address }} proxyclient_address = {{ api_interface_address }}