diff --git a/deployment/logging/files/nova-libvirt.yaml b/deployment/logging/files/nova-libvirt.yaml index c06aabc2ef..b5b7f5aa39 100644 --- a/deployment/logging/files/nova-libvirt.yaml +++ b/deployment/logging/files/nova-libvirt.yaml @@ -4,6 +4,14 @@ description: > OpenStack containerized Nova libvirt service parameters: + Debug: + type: boolean + default: false + description: Set to True to enable debugging on all services. + LibvirtDebug: + type: boolean + default: false + description: Set to True to enable debugging libvirt services. LibvirtLogLevel: default: 3 description: Defines log level in libvirt to filter log output. @@ -24,17 +32,19 @@ outputs: description: Extra hieradata needed to log to files in the host. value: nova::compute::libvirt::log_outputs: - str_replace: - template: - 'LEVEL:file:/var/log/libvirt/libvirtd.log' - params: - LEVEL: {get_param: LibvirtLogLevel} + if: + - or: + - {get_param: Debug } + - {get_param: LibvirtDebug } + - 1 + - {get_param: LibvirtLogLevel} nova::compute::libvirt::virtlogd::log_outputs: - str_replace: - template: - 'LEVEL:file:/var/log/libvirt/virtlogd.log' - params: - LEVEL: {get_param: LibvirtVirtlogdLogLevel} + if: + - or: + - {get_param: Debug } + - {get_param: LibvirtDebug } + - 1 + - {get_param: LibvirtVirtlogdLogLevel} volumes: description: The volumes needed to log to files in the host. value: diff --git a/deployment/logging/stdout/nova-libvirt.yaml b/deployment/logging/stdout/nova-libvirt.yaml index 722786826f..fd02fe4e6a 100644 --- a/deployment/logging/stdout/nova-libvirt.yaml +++ b/deployment/logging/stdout/nova-libvirt.yaml @@ -4,6 +4,14 @@ description: > OpenStack containerized Nova libvirt service parameters: + Debug: + type: boolean + default: false + description: Set to True to enable debugging on all services. + LibvirtDebug: + type: boolean + default: false + description: Set to True to enable debugging libvirt services. LibvirtLogLevel: default: 3 description: Defines log level in libvirt to filter log output. @@ -24,17 +32,19 @@ outputs: description: Extra hieradata needed to log to stdout. value: nova::compute::libvirt::log_outputs: - str_replace: - template: - 'LEVEL:stderr' - params: - LEVEL: {get_param: LibvirtLogLevel} + if: + - or: + - {get_param: Debug } + - {get_param: LibvirtDebug } + - 1 + - {get_param: LibvirtLogLevel} nova::compute::libvirt::virtlogd::log_outputs: - str_replace: - template: - 'LEVEL:stderr' - params: - LEVEL: {get_param: LibvirtVirtlogdLogLevel} + if: + - or: + - {get_param: Debug } + - {get_param: LibvirtDebug } + - 1 + - {get_param: LibvirtVirtlogdLogLevel} docker_config: description: Extra containers needed for logging to stdout or a sidecar container. value: null diff --git a/releasenotes/notes/libvirt-debug-0bf95db421329ff6.yaml b/releasenotes/notes/libvirt-debug-0bf95db421329ff6.yaml new file mode 100644 index 0000000000..6712c9a840 --- /dev/null +++ b/releasenotes/notes/libvirt-debug-0bf95db421329ff6.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + The ``LibvirtDebug`` parameter has been added to enable or disable debug + logging of libvirtd and virtlogd. + + - | + Now the debug logging of libvirtd and virtlogd is enabled automatically + when the Debug parameter is true.