Merge "[Octavia] Set octavia *_log_targets params with tripleo-ansible" into stable/train
This commit is contained in:
commit
89839cfb3d
|
@ -157,11 +157,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
|
||||
|
@ -176,11 +171,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
|
||||
|
@ -267,10 +257,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::disable_local_log_storage: {get_param: OctaviaDisableLocalLogStorage}
|
||||
octavia::nova::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
|
||||
|
|
|
@ -211,6 +211,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:
|
||||
|
@ -276,6 +286,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:
|
||||
|
|
Loading…
Reference in New Issue