openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Fix novavnc haproxy network" into stable/ussuri

This commit is contained in:
Zuul 2021-03-30 00:08:47 +00:00 committed by Gerrit Code Review
parent c569a2799c e15093a247
commit dfcf0a3b1f
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),