d1035703b7
The tripleo-docker-rm role has been replaced by tripleo-container-rm [0].
This role will identify the docker engine via the container_cli variable
and perform a deletion of that container. However, these tasks inside the
post_upgrade_tasks section were thought to remove the old docker containers
after upgrading from rocky to stein, in which podman starts to be the
container engine by default.
For that reason, we need to ensure that the container engine in which the
containers are removed is docker, as otherwise we will be removing the
podman container and the deployment steps will fail.
Closes-Bug: #1836531
[0] - 2135446a35
Depends-On: https://review.opendev.org/#/c/671698/
Change-Id: Ib139a1d77f71fc32a49c9878d1b4a6d07564e9dc
152 lines
5.1 KiB
YAML
152 lines
5.1 KiB
YAML
heat_template_version: rocky
|
|
|
|
description: >
|
|
OpenStack containerized Aodh Notifier service
|
|
|
|
parameters:
|
|
ContainerAodhNotifierImage:
|
|
description: image
|
|
type: string
|
|
ContainerAodhConfigImage:
|
|
description: The container image to use for the aodh 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
|
|
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}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
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:
|
|
get_attr: [AodhBase, role_data, service_config_settings]
|
|
# 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_param: 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_param: 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 }}"
|
|
with_items:
|
|
- { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t }
|
|
- name: aodh logs readme
|
|
copy:
|
|
dest: /var/log/aodh/readme.txt
|
|
content: |
|
|
Log files from aodh containers can be found under
|
|
/var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
|
|
ignore_errors: true
|
|
post_upgrade_tasks:
|
|
- when: step|int == 1
|
|
import_role:
|
|
name: tripleo-docker-rm
|
|
vars:
|
|
containers_to_rm:
|
|
- aodh_notifier
|
|
tripleo_container_cli: "docker"
|
|
fast_forward_upgrade_tasks:
|
|
- when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
block:
|
|
- name: FFU check if openstack-aodh-notifier is deployed
|
|
command: systemctl is-enabled --quiet openstack-aodh-notifier
|
|
ignore_errors: True
|
|
register: aodh_notifier_enabled_result
|
|
- name: Set fact aodh_notifier_enabled
|
|
set_fact:
|
|
aodh_notifier_enabled: "{{ aodh_notifier_enabled_result.rc == 0 }}"
|
|
- name: FFU stop and disable openstack-aodh-notifier service
|
|
service: name=openstack-aodh-notifier state=stopped enabled=no
|
|
when:
|
|
- step|int == 1
|
|
- release == 'ocata'
|
|
- aodh_notifier_enabled|bool
|