openstack
/
puppet-tripleo
Code Issues Proposed changes

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 cc9c81db63)
(cherry picked from commit ce4b87f4cf)
This commit is contained in:
Michele Baldessari 2021-03-17 21:23:58 +01:00 committed by Martin Schuppert
parent e97541284a
commit e15093a247
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/haproxy.pp
View File

@ -451,7 +451,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.
@ -660,7 +660,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),