40467b0f3f
The pre-upgrade validation tasks in the containerized services made
sense when upgrading from non-containerized to containerized overcloud
(ocata to pike), however we kept them for queens and rocky
release thinking about using them during the undercloud upgrade from
non-containerized to containerized (queens to rocky) but they
were skipped there too [0]. It's beeing observed in the current
upgrades taken place by operators, that these validations are
causing more issues than it was thought, so let's get rid of
them from all the containerized services in Queens and Rocky.
Closes-Bug: #1829858
[0] - https://github.com/openstack/python-tripleoclient/blob/stable/rocky/tripleoclient/v1/tripleo_deploy.py#L833
Change-Id: If99ea62b6cefb140a9c918b8f6a774658c52d54b
(cherry picked from commit 7e0a4d0e52
)
175 lines
7.3 KiB
YAML
175 lines
7.3 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack containerized Ceilometer Agent Compute service
|
|
|
|
parameters:
|
|
DockerCeilometerComputeImage:
|
|
description: image
|
|
type: string
|
|
DockerCeilometerConfigImage:
|
|
description: The container image to use for the ceilometer 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
|
|
|
|
CeilometerAgentComputeBase:
|
|
type: ../../puppet/services/ceilometer-agent-compute.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 Ceilometer Agent Compute role.
|
|
value:
|
|
service_name: {get_attr: [CeilometerAgentComputeBase, role_data, service_name]}
|
|
config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, config_settings]}
|
|
logging_source: {get_attr: [CeilometerAgentComputeBase, role_data, logging_source]}
|
|
logging_groups: {get_attr: [CeilometerAgentComputeBase, role_data, logging_groups]}
|
|
service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: ceilometer
|
|
puppet_tags: ceilometer_config
|
|
step_config:
|
|
get_attr: [CeilometerAgentComputeBase, role_data, step_config]
|
|
config_image: {get_param: DockerCeilometerConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/ceilometer_agent_compute.json:
|
|
command: /usr/bin/ceilometer-polling --polling-namespaces compute --logfile /var/log/ceilometer/compute.log
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
docker_config:
|
|
step_4:
|
|
ceilometer_agent_compute:
|
|
image: {get_param: DockerCeilometerComputeImage}
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
|
|
- /var/run/libvirt:/var/run/libvirt:ro
|
|
- /var/log/containers/ceilometer:/var/log/ceilometer
|
|
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/ceilometer, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
|
|
- name: ceilometer logs readme
|
|
copy:
|
|
dest: /var/log/ceilometer/readme.txt
|
|
content: |
|
|
Log files from ceilometer containers can be found under
|
|
/var/log/containers/ceilometer.
|
|
ignore_errors: true
|
|
upgrade_tasks:
|
|
- when: step|int == 0
|
|
tags: common
|
|
block:
|
|
- name: Check if openstack-ceilometer-compute is deployed
|
|
command: systemctl is-enabled --quiet openstack-ceilometer-compute
|
|
ignore_errors: True
|
|
register: openstack_ceilometer_compute_enabled_result
|
|
- name: Set fact openstack_ceilometer_compute_enabled
|
|
set_fact:
|
|
openstack_ceilometer_compute_enabled: "{{ openstack_ceilometer_compute_enabled_result.rc == 0 }}"
|
|
- name: Check if openstack-ceilometer-polling is deployed
|
|
command: systemctl is-enabled --quiet openstack-ceilometer-polling
|
|
ignore_errors: True
|
|
register: openstack_ceilometer_polling_enabled_result
|
|
- name: Set fact openstack_ceilometer_polling_enabled
|
|
set_fact:
|
|
openstack_ceilometer_polling_enabled: "{{ openstack_ceilometer_polling_enabled_result.rc == 0 }}"
|
|
- when: step|int == 2
|
|
block:
|
|
- name: Stop and disable ceilometer compute agent
|
|
service: name=openstack-ceilometer-compute state=stopped enabled=no
|
|
when: openstack_ceilometer_compute_enabled|bool
|
|
- name: Stop and disable ceilometer polling agent
|
|
service: name=openstack-ceilometer-polling state=stopped enabled=no
|
|
when: openstack_ceilometer_polling_enabled|bool
|
|
- when: step|int == 3
|
|
block:
|
|
- name: Set fact for removal of openstack-ceilometer-compute and polling package
|
|
set_fact:
|
|
remove_ceilometer_compute_polling_package: {get_param: UpgradeRemoveUnusedPackages}
|
|
- name: Remove openstack-ceilometer-compute package if operator requests it
|
|
yum: name=openstack-ceilometer-compute state=removed
|
|
ignore_errors: True
|
|
when: remove_ceilometer_compute_polling_package|bool
|
|
- name: Remove openstack-ceilometer-polling package if operator requests it
|
|
yum: name=openstack-ceilometer-polling state=removed
|
|
ignore_errors: True
|
|
when: remove_ceilometer_compute_polling_package|bool
|
|
fast_forward_upgrade_tasks:
|
|
- name: FFU check if openstack-ceilometer-compute is deployed
|
|
command: systemctl is-enabled openstack-ceilometer-compute
|
|
ignore_errors: True
|
|
register: ceilometer_agent_compute_enabled_result
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Set fact ceilometer_agent_compute_enabled
|
|
set_fact:
|
|
ceilometer_agent_compute_enabled: "{{ ceilometer_agent_compute_enabled_result.rc == 0 }}"
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: FFU stop and disable openstack-ceilometer-compute service
|
|
when:
|
|
- step|int == 1
|
|
- release == 'ocata'
|
|
- ceilometer_agent_compute_enabled|bool
|
|
service: name=openstack-ceilometer-compute state=stopped enabled=no
|