openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[Octavia] Set octavia *_log_targets params with tripleo-ansible" into stable/wallaby

This commit is contained in:
Zuul 2023-02-28 19:25:20 +00:00 committed by Gerrit Code Review
parent b785872a71 74d7800782
commit 5baf730f2b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/octavia/octavia-base.yaml
View File

@ -161,11 +161,6 @@ parameters:
default: 300
description: Seconds to wait for a port to detach from an amphora.
type: number
OctaviaAdminLogTargets:
default: []
description: List of syslog endpoints, host:port comma separated list,
to receive administrative log messages.
type: comma_delimited_list
OctaviaAdminLogFacility:
default: 1
description: The syslog "LOG_LOCAL" facility to use for the administrative
@ -180,11 +175,6 @@ parameters:
to the administrative log endponts, including non-load
balancing related logs.
type: boolean
OctaviaTenantLogTargets:
default: []
description: List of syslog endpoints, host:port comma separated list,
to receive tenant traffic flow log messages.
type: comma_delimited_list
OctaviaTenantLogFacility:
default: 0
description: The syslog "LOG_LOCAL" facility to use for the tenant
@ -282,10 +272,8 @@ outputs:
octavia::controller::connection_logging: {get_param: OctaviaConnectionLogging}
octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries}
octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
octavia::controller::admin_log_targets: {get_param: OctaviaAdminLogTargets}
octavia::controller::administrative_log_facility: {get_param: OctaviaAdminLogFacility}
octavia::controller::forward_all_logs: {get_param: OctaviaForwardAllLogs}
octavia::controller::tenant_log_targets: {get_param: OctaviaTenantLogTargets}
octavia::controller::user_log_facility: {get_param: OctaviaTenantLogFacility}
octavia::controller::user_log_format:
if:

12
deployment/octavia/octavia-deployment-config.j2.yaml
View File

@ -205,6 +205,16 @@ parameters:
default: true
description: Configure the nova flavor for the amphora.
type: boolean
OctaviaAdminLogTargets:
default: []
description: List of syslog endpoints, host:port comma separated list,
to receive administrative log messages.
type: comma_delimited_list
OctaviaTenantLogTargets:
default: []
description: List of syslog endpoints, host:port comma separated list,
to receive tenant traffic flow log messages.
type: comma_delimited_list
conditions:
octavia_raw_image_check:
@ -263,6 +273,8 @@ resources:
octavia_flavor_id: { get_param: OctaviaFlavorId }
octavia_flavor_properties: { get_param: OctaviaFlavorProperties }
octavia_manage_nova_flavor: { get_param: OctaviaManageNovaFlavor }
octavia_admin_log_targets: { get_param: OctaviaAdminLogTargets }
octavia_tenant_log_targets: { get_param: OctaviaTenantLogTargets }
outputs:
role_data: