cc4b7f4634
When upgrading from Rocky to Stein we moved also from using the docker
container engine into Podman. To ensure that every single docker container
was removed after the upgrade a post_upgrade task was added which made
use of the tripleo-docker-rm role that removed the container. In this cycle,
from Stein to Train both the Undercloud and Overcloud work with Podman, so
there is no need to remove any docker container anymore.
This patch removes all the tripleo-docker-rm post-upgrade task and in those
services which only included a single task, the post-upgrade-tasks section
is also erased.
Change-Id: I5c9ab55ec6ff332056a426a76e150ea3c9063c6e
(cherry picked from commit 4cbae84c75
)
210 lines
7.3 KiB
YAML
210 lines
7.3 KiB
YAML
heat_template_version: rocky
|
|
|
|
description: >
|
|
OpenStack containerized Gnocchi Statsd service
|
|
|
|
parameters:
|
|
ContainerGnocchiStatsdImage:
|
|
description: image
|
|
type: string
|
|
ContainerGnocchiConfigImage:
|
|
description: The container image to use for the gnocchi 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
|
|
CephClientUserName:
|
|
default: openstack
|
|
type: string
|
|
CephClusterName:
|
|
type: string
|
|
default: ceph
|
|
description: The Ceph cluster name.
|
|
constraints:
|
|
- allowed_pattern: "[a-zA-Z0-9]+"
|
|
description: >
|
|
The Ceph cluster name must be at least 1 character and contain only
|
|
letters and numbers.
|
|
GnocchiFileBasePath:
|
|
default: '/var/lib/gnocchi'
|
|
description: Path to use when file driver is used. This could be NFS or a
|
|
flat file.
|
|
type: string
|
|
MonitoringSubscriptionGnocchiStatsd:
|
|
default: 'overcloud-gnocchi-statsd'
|
|
type: string
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ../containers-common.yaml
|
|
|
|
MySQLClient:
|
|
type: ../../deployment/database/mysql-client.yaml
|
|
|
|
GnocchiServiceBase:
|
|
type: ./gnocchi-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 Gnocchi API role.
|
|
value:
|
|
service_name: gnocchi_statsd
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiStatsd}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [GnocchiServiceBase, role_data, config_settings]
|
|
- tripleo::gnocchi_statsd::firewall_rules:
|
|
'140 gnocchi-statsd':
|
|
dport: 8125
|
|
proto: 'udp'
|
|
service_config_settings: {get_attr: [GnocchiServiceBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: gnocchi
|
|
puppet_tags: gnocchi_config
|
|
step_config:
|
|
list_join:
|
|
- "\n"
|
|
- - "include ::tripleo::profile::base::gnocchi::statsd"
|
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
config_image: {get_param: ContainerGnocchiConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/gnocchi_statsd.json:
|
|
command: /usr/bin/gnocchi-statsd
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
- source: "/var/lib/kolla/config_files/src-ceph/"
|
|
dest: "/etc/ceph/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/log/gnocchi
|
|
owner: gnocchi:gnocchi
|
|
recurse: true
|
|
- path:
|
|
str_replace:
|
|
template: /etc/ceph/CLUSTER.client.USER.keyring
|
|
params:
|
|
CLUSTER: {get_param: CephClusterName}
|
|
USER: {get_param: CephClientUserName}
|
|
owner: gnocchi:gnocchi
|
|
perm: '0600'
|
|
docker_config:
|
|
step_5:
|
|
gnocchi_statsd:
|
|
start_order: 1
|
|
image: {get_param: ContainerGnocchiStatsdImage}
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
healthcheck:
|
|
test: /openstack/healthcheck
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/gnocchi_statsd.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
|
|
- /var/log/containers/gnocchi:/var/log/gnocchi:z
|
|
- /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
|
|
- str_replace:
|
|
template: GNOCCHI_FILE_BASE_PATH:GNOCCHI_FILE_BASE_PATH:SE_FLAGS
|
|
params: {GNOCCHI_FILE_BASE_PATH: {get_param: GnocchiFileBasePath}, SE_FLAGS: 'shared,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/gnocchi, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/log/gnocchi, 'setype': svirt_sandbox_file_t }
|
|
- name: gnocchi logs readme
|
|
copy:
|
|
dest: /var/log/gnocchi/readme.txt
|
|
content: |
|
|
Log files from gnocchi containers can be found under
|
|
/var/log/containers/gnocchi and /var/log/containers/httpd/gnocchi-api.
|
|
ignore_errors: true
|
|
- name: create persistent data directory
|
|
file:
|
|
path: {get_param: GnocchiFileBasePath}
|
|
state: directory
|
|
setype: svirt_sandbox_file_t
|
|
- name: ensure ceph configurations exist
|
|
file:
|
|
path: /etc/ceph
|
|
state: directory
|
|
upgrade_tasks: []
|
|
external_upgrade_tasks:
|
|
- when:
|
|
- step|int == 1
|
|
tags:
|
|
- never
|
|
- system_upgrade_transfer_data
|
|
- system_upgrade_stop_services
|
|
block:
|
|
- name: Stop gnocchi statsd container
|
|
import_role:
|
|
name: tripleo-container-stop
|
|
vars:
|
|
tripleo_containers_to_stop:
|
|
- gnocchi_statsd
|
|
tripleo_delegate_to: "{{ groups['gnocchi_statsd'] | default([]) }}"
|
|
fast_forward_upgrade_tasks:
|
|
- name: FFU check if openstack-gnocchi-statsd is deployed
|
|
command: systemctl is-enabled --quiet openstack-gnocchi-statsd
|
|
ignore_errors: True
|
|
register: gnocchi_statsd_enabled_result
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Set fact gnocchi_statsd_enabled
|
|
set_fact:
|
|
gnocchi_statsd_enabled: "{{ gnocchi_statsd_enabled_result.rc == 0 }}"
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: FFU stop and disable openstack-gnocchi-statsd service
|
|
service: name=openstack-gnocchi-statsd state=stopped enabled=no
|
|
when:
|
|
- step|int == 2
|
|
- release == 'ocata'
|
|
- gnocchi_statsd_enabled|bool
|