ce0ef2fa20
Adds a UpgradeRemoveUnusedPackages param to use in the ansible when conditional for the removal Adds package removal to step2 right after a service is stopped and disabled on step2. Package updates happen in step3 so ideally remove before that. The package removal task has ignore_errors true so dependencies or other issue removing packages will not fail the upgrade workflow. Also adds this to the upgrade environment files for visibility and defaulting false Change-Id: Ie4e4a2d41f7752c5a13507a7c15c6f68e203cfca Related-Bug: 1701501
124 lines
4.2 KiB
YAML
124 lines
4.2 KiB
YAML
heat_template_version: pike
|
|
|
|
description: >
|
|
Containerized collectd service
|
|
|
|
parameters:
|
|
DockerCollectdImage:
|
|
description: image
|
|
type: string
|
|
DockerCollectdConfigImage:
|
|
description: The container image to use for the collectd config_volume
|
|
type: string
|
|
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. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
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
|
|
UpgradeRemoveUnusedPackages:
|
|
default: false
|
|
description: Remove package if the service is being disabled during upgrade
|
|
type: boolean
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ./containers-common.yaml
|
|
|
|
CollectdBase:
|
|
type: ../../puppet/services/metrics/collectd.yaml
|
|
properties:
|
|
EndpointMap: {get_param: EndpointMap}
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the collectd role.
|
|
value:
|
|
service_name: {get_attr: [CollectdBase, role_data, service_name]}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [CollectdBase, role_data, config_settings]
|
|
- tripleo::profile::base::metrics::collectd::enable_file_logging: true
|
|
collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
|
|
logging_source: {get_attr: [CollectdBase, role_data, logging_source]}
|
|
logging_groups: {get_attr: [CollectdBase, role_data, logging_groups]}
|
|
step_config: &step_config
|
|
get_attr: [CollectdBase, role_data, step_config]
|
|
service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: collectd
|
|
puppet_tags: collectd_client_config
|
|
step_config: *step_config
|
|
config_image: {get_param: DockerCollectdConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/collectd.json:
|
|
command: /usr/sbin/collectd -f
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/log/collectd
|
|
owner: collectd:collectd
|
|
recurse: true
|
|
docker_config:
|
|
step_3:
|
|
collectd:
|
|
image: {get_param: DockerCollectdImage}
|
|
net: host
|
|
pid: host
|
|
privileged: true
|
|
user: root
|
|
restart: always
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/collectd/:/var/lib/kolla/config_files/src:ro
|
|
- /var/log/containers/collectd:/var/log/collectd:rw
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
host_prep_tasks:
|
|
- name: create persistent logs directory
|
|
file:
|
|
path: /var/log/containers/collectd
|
|
state: directory
|
|
upgrade_tasks:
|
|
- name: Stop and disable collectd service
|
|
tags: step2
|
|
service: name=collectd.service state=stopped enabled=no
|
|
- name: Remove collectd package if operator requests it
|
|
yum: name=collectd state=removed
|
|
tags: step2
|
|
ignore_errors: True
|
|
when: {get_param: UpgradeRemoveUnusedPackages}
|