openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "libvirt: fix formatting of the log_outputs parameter" into stable/wallaby

This commit is contained in:
Zuul 2021-07-28 15:48:32 +00:00 committed by Gerrit Code Review
parent 76da6c28ee 78a19f7dcc
commit fc9cdf4f64
2 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
deployment/logging/files/nova-libvirt.yaml
View File

@ -32,19 +32,29 @@ outputs:
description: Extra hieradata needed to log to files in the host. description: Extra hieradata needed to log to files in the host.
value: value:
nova::compute::libvirt::log_outputs: nova::compute::libvirt::log_outputs:
if: str_replace:
- or: template:
- {get_param: Debug } 'LEVEL:file:/var/log/libvirt/libvirtd.log'
- {get_param: LibvirtDebug } params:
- 1 LEVEL:
- {get_param: LibvirtLogLevel} if:
- or:
- {get_param: Debug }
- {get_param: LibvirtDebug }
- 1
- {get_param: LibvirtLogLevel}
nova::compute::libvirt::virtlogd::log_outputs: nova::compute::libvirt::virtlogd::log_outputs:
if: str_replace:
- or: template:
- {get_param: Debug } 'LEVEL:file:/var/log/libvirt/virtlogd.log'
- {get_param: LibvirtDebug } params:
- 1 LEVEL:
- {get_param: LibvirtVirtlogdLogLevel} if:
- or:
- {get_param: Debug }
- {get_param: LibvirtDebug }
- 1
- {get_param: LibvirtVirtlogdLogLevel}
volumes: volumes:
description: The volumes needed to log to files in the host. description: The volumes needed to log to files in the host.
value: value:

34
deployment/logging/stdout/nova-libvirt.yaml
View File

@ -32,19 +32,29 @@ outputs:
description: Extra hieradata needed to log to stdout. description: Extra hieradata needed to log to stdout.
value: value:
nova::compute::libvirt::log_outputs: nova::compute::libvirt::log_outputs:
if: str_replace:
- or: template:
- {get_param: Debug } 'LEVEL:stderr'
- {get_param: LibvirtDebug } params:
- 1 LEVEL:
- {get_param: LibvirtLogLevel} if:
- or:
- {get_param: Debug }
- {get_param: LibvirtDebug }
- 1
- {get_param: LibvirtLogLevel}
nova::compute::libvirt::virtlogd::log_outputs: nova::compute::libvirt::virtlogd::log_outputs:
if: str_replace:
- or: template:
- {get_param: Debug } 'LEVEL:stderr'
- {get_param: LibvirtDebug } params:
- 1 LEVEL:
- {get_param: LibvirtVirtlogdLogLevel} if:
- or:
- {get_param: Debug }
- {get_param: LibvirtDebug }
- 1
- {get_param: LibvirtVirtlogdLogLevel}
docker_config: docker_config:
description: Extra containers needed for logging to stdout or a sidecar container. description: Extra containers needed for logging to stdout or a sidecar container.
value: null value: null