openstack/kolla-ansible
Code Issues Proposed changes

HyperV: fix FreeRDP console config

Browse Source 
Console access for HyperV VMs is now done via Kolla VIP.
The VIP will point to each HyperV compute node IP on which
FreeRDP-WebConnect is installed.

Closes-Bug: #1714249
Change-Id: I3a5d23425996a5c347ff21df3f99c3f63dd35173
This commit is contained in:
Dan Ardelean 2017-09-01 19:14:28 +03:00
parent 8c30163853
commit 418d584693
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -160,6 +160,12 @@ listen nova_spicehtml5proxy
{% for host in groups['nova-spicehtml5proxy'] %} {% for host in groups['nova-spicehtml5proxy'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_spicehtml5proxy_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_spicehtml5proxy_port }} check inter 2000 rise 2 fall 5
{% endfor %} {% endfor %}
{% elif nova_console == 'rdp' %}
listen nova_rdp
bind {{ kolla_internal_vip_address }}:{{ rdp_port }}
{% for host in groups['hyperv'] %}
server {{ hostvars[host]['ansible_hostname'] }} {% for ip in hostvars[host]['ansible_ip_addresses'] %}{% if host == ip %}{{ ip }}{% endif %}{% endfor %}:{{ rdp_port }} check inter 2000 rise 2 fall 5
{% endfor %}
{% endif %} {% endif %}
{% if enable_nova_serialconsole_proxy | bool %} {% if enable_nova_serialconsole_proxy | bool %}

2
ansible/roles/nova-hyperv/templates/nova_hyperv.conf.j2
View File

@ -47,7 +47,7 @@ enable_instance_metrics_collection = false
[rdp] [rdp]
enabled = true enabled = true
html5_proxy_base_url = {{ public_protocol }}://{{ ansible_fqdn }}:{{ rdp_port }} html5_proxy_base_url = {{ public_protocol }}://{{ kolla_internal_vip_address }}:{{ rdp_port }}
[neutron] [neutron]
url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }} url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}

2
etc/kolla/globals.yml
View File

@ -121,7 +121,7 @@ kolla_internal_vip_address: "10.10.10.254"
# Valid options are [ True, False ] # Valid options are [ True, False ]
#openstack_logging_debug: "False" #openstack_logging_debug: "False"
# Valid options are [ novnc, spice ] # Valid options are [ novnc, spice, rdp ]
#nova_console: "novnc" #nova_console: "novnc"
# OpenStack services can be enabled or disabled with these options # OpenStack services can be enabled or disabled with these options