From d0c885544a22daaeae1797ab993a21b40a9601c2 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 17 Mar 2021 21:23:58 +0100 Subject: [PATCH] Fix novavnc haproxy network Since "Use single NovaLibvirtNetwork to configure instance console components" Icef2481b65b41b524ad44eeecfbee4451006e1d2, we are getting the following error: Error while evaluating a Function Call, The service_network for this service is undefined. Can't configure TLS for the internal network. Let's first lookup the old network and then the newer one to keep compatibility. Tested by triggering fs039 on https://review.opendev.org/c/openstack/tripleo-heat-templates/+/780934 with a dep-on on this review. Change-Id: Ic9ae8a1a0f69d85b2acd2598644c1cae8c1db78d Closes-Bug: #1919506 (cherry picked from commit cc9c81db63f0cce18d3370a984a725c0a1809223) (cherry picked from commit ce4b87f4cf8d4b4f63a8fa6a0e11e8fd87ec82f6) (cherry picked from commit e15093a247a696e69c6a4846fdd28a7a3c67d236) --- manifests/haproxy.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 57cc74d83..9adb35190 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -479,7 +479,7 @@ # # [*nova_novncproxy_network*] # (optional) Specify the network nova_novncproxy is running on. -# Defaults to hiera('nova_vncproxy_network', undef) +# Defaults to hiera('nova_vnc_proxy_network', hiera('nova_libvirt_network', undef)) # # [*nova_osapi_network*] # (optional) Specify the network nova_osapi is running on. @@ -721,7 +721,7 @@ class tripleo::haproxy ( $mistral_network = hiera('mistral_api_network', undef), $neutron_network = hiera('neutron_api_network', undef), $nova_metadata_network = hiera('nova_metadata_network', undef), - $nova_novncproxy_network = hiera('nova_vnc_proxy_network', undef), + $nova_novncproxy_network = hiera('nova_vnc_proxy_network', hiera('nova_libvirt_network', undef)), $nova_osapi_network = hiera('nova_api_network', undef), $placement_network = hiera('placement_network', undef), $octavia_network = hiera('octavia_api_network', undef),