Merge "Murano logging to rsyslog"

This commit is contained in:
Jenkins 2015-09-28 13:54:19 +00:00 committed by Gerrit Code Review
commit 40f9f0816f
3 changed files with 15 additions and 2 deletions

View File

@ -126,6 +126,12 @@ $template SwiftObjectExpirerFile,"/var/log/swift/swift-object-expirer.log"
$template SwiftObjectUpdaterFile,"/var/log/swift/swift-object-updater.log"
:syslogtag,contains,"swift-object-updater" ?SwiftObjectUpdaterFile
$template MuranoEngineFile,"/var/log/murano/murano-engine.log"
:syslogtag,contains,"murano-engine" ?MuranoEngineFile
$template MuranoApiFile,"/var/log/murano/murano-api.log"
:syslogtag,contains,"murano-api" ?MuranoApiFile
$template DynFile,"/var/log/syslog.log"
*.* ?DynFile
& ~

View File

@ -13,7 +13,9 @@
insecure_registry: "{{ docker_insecure_registry }}"
name: murano_engine
image: "{{ murano_engine_image_full }}"
volumes: "{{ node_config_directory }}/murano-engine/:/opt/kolla/config_files/:ro"
volumes:
- "{{ node_config_directory }}/murano-engine/:/opt/kolla/config_files/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
volumes_from:
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@ -33,7 +35,9 @@
insecure_registry: "{{ docker_insecure_registry }}"
name: murano_api
image: "{{ murano_api_image_full }}"
volumes: "{{ node_config_directory }}/murano-api/:/opt/kolla/config_files/:ro"
volumes:
- "{{ node_config_directory }}/murano-api/:/opt/kolla/config_files/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['murano-api']

View File

@ -7,6 +7,9 @@ rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
notification_driver = noop
use_syslog = True
syslog_log_facility = LOG_LOCAL0
{% if service_name == 'murano-api' %}
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind_port = {{ murano_api_port }}