Merge "HyperV: fix FreeRDP console config"

ansible/roles/haproxy/templates/haproxy.cfg.j2

@@ -160,6 +160,12 @@ listen 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
 {% 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 %}
 
 {% if enable_nova_serialconsole_proxy | bool %}

ansible/roles/nova-hyperv/templates/nova_hyperv.conf.j2

@@ -47,7 +47,7 @@ enable_instance_metrics_collection = false
 
 [rdp]
 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]
 url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}

etc/kolla/globals.yml

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