openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add option for nova compute container to log to stdout/stderr 

This adds the option to get the nova-compute container to log to stdout.
The option is disabled by default.

bp logging-stdout-rsyslog

Change-Id: Id09f4c439987ce3d668d53932e5a4dc6ee3b280d
This commit is contained in:
Juan Antonio Osorio Robles 2017-10-09 11:27:23 +00:00
parent 3bf720ee11
commit c651a67ef5
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docker/services/nova-compute.yaml
View File

@ -68,13 +68,21 @@ resources:
RoleName: {get_param: RoleName} RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
NovaLogging:
type: OS::TripleO::Services::Logging::NovaCommon
properties:
DockerNovaImage: {get_param: DockerNovaComputeImage}
NovaServiceName: 'compute'
outputs: outputs:
role_data: role_data:
description: Role data for the Nova Compute service. description: Role data for the Nova Compute service.
value: value:
service_name: {get_attr: [NovaComputeBase, role_data, service_name]} service_name: {get_attr: [NovaComputeBase, role_data, service_name]}
config_settings: config_settings:
get_attr: [NovaComputeBase, role_data, config_settings] map_merge:
- get_attr: [NovaComputeBase, role_data, config_settings]
- get_attr: [NovaLogging, config_settings]
logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]} logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaComputeBase, role_data, logging_groups]} logging_groups: {get_attr: [NovaComputeBase, role_data, logging_groups]}
step_config: &step_config step_config: &step_config
@ -89,7 +97,11 @@ outputs:
config_image: {get_param: DockerNovaLibvirtConfigImage} config_image: {get_param: DockerNovaLibvirtConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/nova_compute.json: /var/lib/kolla/config_files/nova_compute.json:
command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf command:
list_join:
- ' '
- - /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
- get_attr: [NovaLogging, cmd_extra_args]
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"
@ -125,6 +137,7 @@ outputs:
volumes: volumes:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- {get_attr: [NovaLogging, volumes]}
- -
- /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
@ -135,18 +148,18 @@ outputs:
- /run:/run - /run:/run
- /var/lib/nova:/var/lib/nova:shared - /var/lib/nova:/var/lib/nova:shared
- /var/lib/libvirt:/var/lib/libvirt - /var/lib/libvirt:/var/lib/libvirt
- /var/log/containers/nova:/var/log/nova
- /sys/class/net:/sys/class/net - /sys/class/net:/sys/class/net
- /sys/bus/pci:/sys/bus/pci - /sys/bus/pci:/sys/bus/pci
environment: environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: host_prep_tasks:
- name: create persistent directories list_concat:
- {get_attr: [NovaLogging, host_prep_tasks]}
- - name: create persistent directories
file: file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
with_items: with_items:
- /var/log/containers/nova
- /var/lib/nova - /var/lib/nova
- /var/lib/libvirt - /var/lib/libvirt
- name: ensure ceph configurations exist - name: ensure ceph configurations exist