Merge "Set logging parameters for virtlogd"

deployment/logging/files/nova-libvirt.yaml

@@ -11,6 +11,13 @@ parameters:
     type: number
     constraints:
       - range: { min: 1, max: 4 }
+  LibvirtVirtlogdLogLevel:
+    default: 3
+    description: Defines log level in virtlogd to filter log output.
+                 See https://libvirt.org/logging.html to find its detail.
+    type: number
+    constraints:
+      - range: { min: 1, max: 4 }
 
 outputs:
   config_settings:
@@ -22,6 +29,12 @@ outputs:
             'LEVEL:file:/var/log/libvirt/libvirtd.log'
           params:
             LEVEL: {get_param: LibvirtLogLevel}
+      nova::compute::libvirt::virtlogd::log_outputs:
+        str_replace:
+          template:
+            'LEVEL:file:/var/log/libvirt/virtlogd.log'
+          params:
+            LEVEL: {get_param: LibvirtVirtlogdLogLevel}
   volumes:
     description: The volumes needed to log to files in the host.
     value:

deployment/logging/stdout/nova-libvirt.yaml

@@ -11,6 +11,13 @@ parameters:
     type: number
     constraints:
       - range: { min: 1, max: 4 }
+  LibvirtVirtlogdLogLevel:
+    default: 3
+    description: Defines log level in virtlogd to filter log output.
+                 See https://libvirt.org/logging.html to find its detail.
+    type: number
+    constraints:
+      - range: { min: 1, max: 4 }
 
 outputs:
   config_settings:
@@ -22,6 +29,12 @@ outputs:
             'LEVEL:stderr'
           params:
             LEVEL: {get_param: LibvirtLogLevel}
+      nova::compute::libvirt::virtlogd::log_outputs:
+        str_replace:
+          template:
+            'LEVEL:stderr'
+          params:
+            LEVEL: {get_param: LibvirtVirtlogdLogLevel}
   docker_config:
     description: Extra containers needed for logging to stdout or a sidecar container.
     value: null

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -215,11 +215,17 @@ parameters:
     tags:
       - role_specific
   LibvirtLogFilters:
-    description: Defines a filter to select a different logging level
+    description: Defines a filter in libvirt daemon to select a different
-                 for a given category log outputs, as specified in
+                 logging level for a given category log outputs, as specified
-                 https://libvirt.org/logging.html .
+                 in https://libvirt.org/logging.html .
     type: string
     default: '1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 3:object 1:util'
+  LibvirtVirtlogdLogFilters:
+    description: Defines a filter in virtlogd to select a different
+                 logging level for a given category log outputs, as specified
+                 in https://libvirt.org/logging.html .
+    type: string
+    default: '1:logging 4:object 4:json 4:event 1:util'
   LibvirtTLSPriority:
     description: >
       Override the compile time default TLS priority string.
@@ -402,6 +408,7 @@ outputs:
                  params:
                    $NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
             nova::compute::libvirt::log_filters: {get_param: LibvirtLogFilters}
+            nova::compute::libvirt::virtlogd::log_filters: {get_param: LibvirtVirtlogdLogFilters}
             rbd_persistent_storage: {get_param: CinderEnableRbdBackend}
           -
             if:
@@ -551,7 +558,7 @@ outputs:
               - {}
       puppet_config:
         config_volume: nova_libvirt
-        puppet_tags: libvirtd_config,nova_config,file,libvirt_tls_password
+        puppet_tags: libvirtd_config,virtlogd_config,nova_config,file,libvirt_tls_password
         step_config:
           list_join:
             - "\n"
@@ -651,6 +658,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
+                - {get_attr: [NovaLibvirtLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_virtlogd.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro

releasenotes/notes/libvirt-virtlogd-logs-377ff4083a58cde4.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Now virtlogd will output its logs into an independent log file,
+    /var/log/containers/libvirt/virtlogd.log, instead of host journal.
+  - |
+    LibvirtVirtlogdLogLevel and LibvirtVirtlogdLogFilters were added to
+    set logging parameters in virtlogd.