e07098b534
Currently logs from aodh services are not captured by rsyslog. This change fixes the missing logging sources so that these logs are also detected by rsyslog. Change-Id: I8ab0a7f9ba5e9af47af549bac88180bde0d3c782
157 lines
5.2 KiB
YAML
157 lines
5.2 KiB
YAML
heat_template_version: wallaby
|
|
|
|
description: >
|
|
OpenStack containerized Aodh Notifier service
|
|
|
|
parameters:
|
|
ContainerAodhNotifierImage:
|
|
description: image
|
|
type: string
|
|
tags:
|
|
- role_specific
|
|
ContainerAodhConfigImage:
|
|
description: The container image to use for the aodh config_volume
|
|
type: string
|
|
tags:
|
|
- role_specific
|
|
AodhNotifierLoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.aodh.notifier
|
|
file: /var/log/containers/aodh/aodh-notifier.log
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. Use
|
|
parameter_merge_strategies to merge it with the defaults.
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
MonitoringSubscriptionAodhNotifier:
|
|
default: 'overcloud-ceilometer-aodh-notifier'
|
|
type: string
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ../containers-common.yaml
|
|
|
|
MySQLClient:
|
|
type: ../database/mysql-client.yaml
|
|
|
|
AodhBase:
|
|
type: ./aodh-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
RoleParametersValue:
|
|
type: OS::Heat::Value
|
|
properties:
|
|
type: json
|
|
value:
|
|
map_replace:
|
|
- map_replace:
|
|
- ContainerAodhNotifierImage: ContainerAodhNotifierImage
|
|
ContainerAodhConfigImage: ContainerAodhConfigImage
|
|
- values: {get_param: [RoleParameters]}
|
|
- values:
|
|
ContainerAodhNotifierImage: {get_param: ContainerAodhNotifierImage}
|
|
ContainerAodhConfigImage: {get_param: ContainerAodhConfigImage}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Aodh API role.
|
|
value:
|
|
service_name: aodh_notifier
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionAodhNotifier}
|
|
config_settings:
|
|
get_attr: [AodhBase, role_data, config_settings]
|
|
service_config_settings:
|
|
map_merge:
|
|
- {get_attr: [AodhBase, role_data, service_config_settings]}
|
|
- rsyslog:
|
|
tripleo_logging_sources_aodh_notifier:
|
|
- {get_param: AodhNotifierLoggingSource}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: aodh
|
|
puppet_tags: aodh_config
|
|
step_config:
|
|
list_join:
|
|
- "\n"
|
|
- - "include tripleo::profile::base::aodh::notifier"
|
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
config_image: {get_attr: [RoleParametersValue, value, ContainerAodhConfigImage]}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/aodh_notifier.json:
|
|
command: /usr/bin/aodh-notifier
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/log/aodh
|
|
owner: aodh:aodh
|
|
recurse: true
|
|
docker_config:
|
|
step_4:
|
|
aodh_notifier:
|
|
image: {get_attr: [RoleParametersValue, value, ContainerAodhNotifierImage]}
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
- - /var/lib/kolla/config_files/aodh_notifier.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro
|
|
- /var/log/containers/aodh:/var/log/aodh:z
|
|
environment:
|
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
|
host_prep_tasks:
|
|
- name: create persistent directories
|
|
file:
|
|
path: "{{ item.path }}"
|
|
state: directory
|
|
setype: "{{ item.setype }}"
|
|
mode: "{{ item.mode|default(omit) }}"
|
|
with_items:
|
|
- { 'path': /var/log/containers/aodh, 'setype': container_file_t, 'mode': '0750' }
|
|
- { 'path': /var/log/aodh, 'setype': container_file_t }
|
|
external_upgrade_tasks:
|
|
- when:
|
|
- step|int == 1
|
|
tags:
|
|
- never
|
|
- system_upgrade_transfer_data
|
|
- system_upgrade_stop_services
|
|
block:
|
|
- name: Stop aodh notifier container
|
|
import_role:
|
|
name: tripleo_container_stop
|
|
vars:
|
|
tripleo_containers_to_stop:
|
|
- aodh_notifier
|
|
tripleo_delegate_to: "{{ groups['aodh_notifier'] | default([]) }}"
|