diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml index 25001bf8d9..c00e3b4aa8 100644 --- a/deployment/octavia/octavia-deployment-config.j2.yaml +++ b/deployment/octavia/octavia-deployment-config.j2.yaml @@ -178,6 +178,12 @@ parameters: to the administrative log endponts and will be stored with the controller logs. type: boolean + OctaviaLogOffloadProtocol: + default: 'udp' + description: The protocol to use for the RSyslog log offloading feature. + type: string + constraints: + - allowed_values: ['udp', 'tcp'] OctaviaFlavorId: default: '65' description: Nova flavor ID to be used when creating the nova flavor for @@ -256,6 +262,7 @@ outputs: octavia_group_vars_dir: "{{playbook_dir}}/octavia-ansible/group_vars" container_cli: { get_param: ContainerCli } enable_log_offloading: { get_param: OctaviaLogOffload } + log_offload_protocol: { get_param: OctaviaLogOffloadProtocol } octavia_flavor_id: { get_param: OctaviaFlavorId } octavia_flavor_properties: { get_param: OctaviaFlavorProperties } octavia_manage_nova_flavor: { get_param: OctaviaManageNovaFlavor } diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index a2721daf3a..a8ca3aadb0 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -62,6 +62,12 @@ parameters: to the administrative log endponts and will be stored with the controller logs. type: boolean + OctaviaLogOffloadProtocol: + default: 'udp' + description: The protocol to use for the RSyslog log offloading feature. + type: string + constraints: + - allowed_values: ['udp', 'tcp'] resources: ContainersCommon: @@ -106,7 +112,7 @@ outputs: dport: 5555 iniface: {get_param: OctaviaMgmtPortDevName} '210 octavia lb-mgmt-net offload rsyslog': - proto: udp + proto: {get_param: OctaviaLogOffloadProtocol} dport: 514 iniface: {get_param: OctaviaMgmtPortDevName} monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaHealthManager} diff --git a/releasenotes/notes/add-octavia-log-offload-protocol-dfc5d8387c3d83bc.yaml b/releasenotes/notes/add-octavia-log-offload-protocol-dfc5d8387c3d83bc.yaml new file mode 100644 index 0000000000..bc5fa5902d --- /dev/null +++ b/releasenotes/notes/add-octavia-log-offload-protocol-dfc5d8387c3d83bc.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Added new OctaviaLogOffloadProtocol setting that allows to select either + UDP (default) or TCP as protocol for log offloading.