openstack/kolla-ansible
Code Issues Proposed changes

Heat logging to rsyslog

Browse Source 
Configure heat to use rsyslog container as logging mechanism

Change-Id: I71691bbc7c8cb56758e3597da7f44445a4bf5599
Implements: bp logging-container
This commit is contained in:
Michal Jastrzebski
2015-09-23 13:40:45 +02:00
parent a83d84b383
commit 603bbae0f4
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/common/templates/rsyslog.conf.j2
View File

@@ -33,6 +33,15 @@ $template NovaSchedulerFile,"/var/log/nova/nova-scheduler.log"
$template NovaComputeFile,"/var/log/nova/nova-compute.log" $template NovaComputeFile,"/var/log/nova/nova-compute.log"
:syslogtag,contains,"nova-compute" ?NovaComputeFile :syslogtag,contains,"nova-compute" ?NovaComputeFile
$template HeatAPIFile,"/var/log/heat/heat-api.log"
:syslogtag,contains,"heat-api" ?HeatAPIFile
$template HeatAPICfnFile,"/var/log/heat/heat-api-cfn.log"
:syslogtag,contains,"heat-api-cfn" ?HeatAPICfnFile
$template HeatEngineFile,"/var/log/heat/heat-engine.log"
:syslogtag,contains,"heat-engine" ?HeatEngineFile
$template DynFile,"/var/log/syslog.log" $template DynFile,"/var/log/syslog.log"
*.* ?DynFile *.* ?DynFile
& ~ & ~

12
ansible/roles/heat/tasks/start.yml
View File

@@ -13,7 +13,9 @@
insecure_registry: "{{ docker_insecure_registry }}" insecure_registry: "{{ docker_insecure_registry }}"
name: heat_api name: heat_api
image: "{{ heat_api_image_full }}" image: "{{ heat_api_image_full }}"
volumes: "{{ node_config_directory }}/heat-api/:/opt/kolla/config_files/:ro" volumes:
- "{{ node_config_directory }}/heat-api/:/opt/kolla/config_files/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
env: env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['heat-api'] when: inventory_hostname in groups['heat-api']
@@ -32,7 +34,9 @@
insecure_registry: "{{ docker_insecure_registry }}" insecure_registry: "{{ docker_insecure_registry }}"
name: heat_api_cfn name: heat_api_cfn
image: "{{ heat_api_cfn_image_full }}" image: "{{ heat_api_cfn_image_full }}"
volumes: "{{ node_config_directory }}/heat-api-cfn/:/opt/kolla/config_files/:ro" volumes:
- "{{ node_config_directory }}/heat-api-cfn/:/opt/kolla/config_files/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
env: env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['heat-api-cfn'] when: inventory_hostname in groups['heat-api-cfn']
@@ -51,7 +55,9 @@
insecure_registry: "{{ docker_insecure_registry }}" insecure_registry: "{{ docker_insecure_registry }}"
name: heat_engine name: heat_engine
image: "{{ heat_engine_image_full }}" image: "{{ heat_engine_image_full }}"
volumes: "{{ node_config_directory }}/heat-engine/:/opt/kolla/config_files/:ro" volumes:
- "{{ node_config_directory }}/heat-engine/:/opt/kolla/config_files/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
env: env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['heat-engine'] when: inventory_hostname in groups['heat-engine']

3
ansible/roles/heat/templates/heat.conf.j2
View File

@@ -11,6 +11,9 @@ rpc_backend = rabbit
notification_driver = noop notification_driver = noop
deferred_auth_method = password deferred_auth_method = password
syslog_log_facility=LOG_LOCAL0
use_syslog=yes
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_host = {{ kolla_internal_address }} rabbit_host = {{ kolla_internal_address }}
rabbit_userid = {{ rabbitmq_user }} rabbit_userid = {{ rabbitmq_user }}