diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-01 12:47:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-01 12:47:04 +0000 |
| commit | 9aceea8ef39e4fd5334d2488eb1002d00cb496a7 (patch) | |
| tree | 2b1738140ab8ba8ecf3ff3ee655f53ffda716cdd /ansible | |
| parent | 870cb1beb229d6f856da4c974ca7e73d3d89d56d (diff) | |
| parent | 94d824dd0eec3f1a37586c03d0b79b074c37653e (diff) | |
| download | kolla-ansible-9aceea8ef39e4fd5334d2488eb1002d00cb496a7.tar.gz kolla-ansible-9aceea8ef39e4fd5334d2488eb1002d00cb496a7.zip | |
Merge "Use secure websocket for nova serial console proxy when TLS enabled"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 1e59d9d4e..afc557c2a 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -346,6 +346,7 @@ nova_spicehtml5proxy_listen_port: "{{ nova_spicehtml5proxy_port }}" nova_serialproxy_fqdn: "{{ kolla_external_fqdn }}" nova_serialproxy_port: "6083" 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_external_fqdn: "{{ kolla_external_fqdn }}" diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 47770893c..ed6e73c75 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -97,7 +97,7 @@ enabled = false {% if enable_nova_serialconsole_proxy | bool %} [serial_console] 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_port = {{ nova_serialproxy_listen_port }} proxyclient_address = {{ api_interface_address }} |