diff --git a/docker/services/logging/stdout/nova-libvirt.yaml b/docker/services/logging/stdout/nova-libvirt.yaml new file mode 100644 index 0000000000..a646c09570 --- /dev/null +++ b/docker/services/logging/stdout/nova-libvirt.yaml @@ -0,0 +1,19 @@ +heat_template_version: pike + +description: > + OpenStack containerized Nova libvirt service + +outputs: + config_settings: + description: Extra hieradata needed to log to stdout. + value: + nova::compute::libvirt::log_outputs: '3:stderr' + docker_config: + description: Extra containers needed for logging to stdout or a sidecar container. + value: null + volumes: + description: The volumes needed to log to stdout or a sidecar container. + value: null + host_prep_tasks: + description: Extra ansible tasks needed for logging to files in the host. + value: null diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index 551cc9c016..23b8db3ca4 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -106,6 +106,9 @@ resources: RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} + NovaLibvirtLogging: + type: OS::TripleO::Services::Logging::NovaLibvirt + outputs: role_data: description: Role data for the Libvirt service. @@ -114,6 +117,7 @@ outputs: config_settings: map_merge: - get_attr: [NovaLibvirtBase, role_data, config_settings] + - get_attr: [NovaLibvirtLogging, config_settings] - tripleo::profile::base::certmonger_user::libvirt_postsave_cmd: "true" # TODO: restart the libvirt container here logging_source: {get_attr: [NovaLibvirtBase, role_data, logging_source]} diff --git a/environments/stdout-logging.yaml b/environments/stdout-logging.yaml index 2fe30cb9a0..9a71aa20f5 100644 --- a/environments/stdout-logging.yaml +++ b/environments/stdout-logging.yaml @@ -7,3 +7,4 @@ resource_registry: OS::TripleO::Services::Logging::NovaApi: ../docker/services/logging/stdout/nova-api.yaml OS::TripleO::Services::Logging::NovaCommon: ../docker/services/logging/stdout/nova-common.yaml OS::TripleO::Services::Logging::NovaPlacement: ../docker/services/logging/stdout/nova-placement.yaml + OS::TripleO::Services::Logging::NovaLibvirt: ../docker/services/logging/stdout/nova-libvirt.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 1095e764ee..e0ef9dc1a7 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -305,6 +305,7 @@ resource_registry: OS::TripleO::Services::Logging::NovaApi: docker/services/logging/files/nova-api.yaml OS::TripleO::Services::Logging::NovaCommon: docker/services/logging/files/nova-common.yaml OS::TripleO::Services::Logging::NovaPlacement: docker/services/logging/files/nova-placement.yaml + OS::TripleO::Services::Logging::NovaLibvirt: OS::Heat::None parameter_defaults: EnablePackageInstall: false