diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 1d560825b4..01e5d97d77 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -14,6 +14,11 @@ parameters: type: string tags: - role_specific + ManilaApiLoggingSource: + type: json + default: + tag: openstack.manila.api + file: /var/log/containers/manila/manila-api.log EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -264,6 +269,9 @@ outputs: - {get_attr: [ManilaBase, role_data, service_config_settings]} - horizon: horizon::dashboards::manila::policies: {get_param: ManilaApiPolicies} + rsyslog: + tripleo_logging_sources_manila_api: + - {get_param: ManilaApiLoggingSource} # BEGIN DOCKER SETTINGS # puppet_config: config_volume: manila diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 96b58078d1..57a7ace945 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -14,6 +14,11 @@ parameters: type: string tags: - role_specific + ManilaSchedulerLoggingSource: + type: json + default: + tag: openstack.manila.scheduler + file: /var/log/containers/manila/manila-scheduler.log EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -76,7 +81,12 @@ outputs: service_name: manila_scheduler monitoring_subscription: {get_param: MonitoringSubscriptionManilaScheduler} config_settings: {get_attr: [ManilaBase, role_data, config_settings]} - service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]} + service_config_settings: + map_merge: + - {get_attr: [ManilaBase, role_data, service_config_settings]} + - rsyslog: + tripleo_logging_sources_manila_scheduler: + - {get_param: ManilaSchedulerLoggingSource} # BEGIN DOCKER SETTINGS # puppet_config: config_volume: manila diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index cfec1750c6..7153cbba44 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -14,6 +14,11 @@ parameters: type: string tags: - role_specific + ManilaShareLoggingSource: + type: json + default: + tag: openstack.manila.share + file: /var/log/containers/manila/manila-share.log EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -148,7 +153,11 @@ outputs: manila::volume::cinder::region_name: {get_param: KeystoneRegion} manila::volume::cinder::endpoint_type: 'internalURL' service_config_settings: - {get_attr: [ManilaBase, role_data, service_config_settings]} + map_merge: + - {get_attr: [ManilaBase, role_data, service_config_settings]} + - rsyslog: + tripleo_logging_sources_manila_share: + - {get_param: ManilaShareLoggingSource} # BEGIN DOCKER SETTINGS puppet_config: config_volume: manila