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
)
187 lines
6.9 KiB
YAML
187 lines
6.9 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack containerized Cinder Scheduler service
|
|
|
|
parameters:
|
|
DockerCinderSchedulerImage:
|
|
description: image
|
|
type: string
|
|
DockerCinderConfigImage:
|
|
description: The container image to use for the cinder 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
|
|
|
|
MySQLClient:
|
|
type: ../../puppet/services/database/mysql-client.yaml
|
|
|
|
CinderBase:
|
|
type: ../../puppet/services/cinder-scheduler.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 Cinder Scheduler role.
|
|
value:
|
|
service_name: {get_attr: [CinderBase, role_data, service_name]}
|
|
config_settings: {get_attr: [CinderBase, role_data, config_settings]}
|
|
logging_source: {get_attr: [CinderBase, role_data, logging_source]}
|
|
logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
|
|
service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: cinder
|
|
puppet_tags: cinder_config,file,concat,file_line
|
|
step_config:
|
|
list_join:
|
|
- "\n"
|
|
- - {get_attr: [CinderBase, role_data, step_config]}
|
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
config_image: {get_param: DockerCinderConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/cinder_scheduler.json:
|
|
command: /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/log/cinder
|
|
owner: cinder:cinder
|
|
recurse: true
|
|
docker_config:
|
|
step_2:
|
|
cinder_scheduler_init_logs:
|
|
image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage}
|
|
privileged: false
|
|
user: root
|
|
volumes:
|
|
- /var/log/containers/cinder:/var/log/cinder
|
|
command: ['/bin/bash', '-c', 'chown -R cinder:cinder /var/log/cinder']
|
|
step_4:
|
|
cinder_scheduler:
|
|
image: *cinder_scheduler_image
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
healthcheck:
|
|
test:
|
|
list_join:
|
|
- ' '
|
|
- - '/openstack/healthcheck'
|
|
- yaql:
|
|
expression: str($.data.port)
|
|
data:
|
|
port: {get_attr: [CinderBase, role_data, config_settings, 'cinder::rabbit_port']}
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/cinder_scheduler.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
|
|
- /var/log/containers/cinder:/var/log/cinder
|
|
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/cinder, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/log/cinder, 'setype': svirt_sandbox_file_t }
|
|
- name: cinder logs readme
|
|
copy:
|
|
dest: /var/log/cinder/readme.txt
|
|
content: |
|
|
Log files from cinder containers can be found under
|
|
/var/log/containers/cinder and /var/log/containers/httpd/cinder-api.
|
|
ignore_errors: true
|
|
upgrade_tasks:
|
|
- when: step|int == 0
|
|
tags: common
|
|
block:
|
|
- name: Check if cinder_scheduler is deployed
|
|
command: systemctl is-enabled openstack-cinder-scheduler
|
|
ignore_errors: True
|
|
register: cinder_scheduler_enabled_result
|
|
- name: Set fact cinder_scheduler_enabled
|
|
set_fact:
|
|
cinder_scheduler_enabled: "{{ cinder_scheduler_enabled_result.rc == 0 }}"
|
|
- when: step|int == 2
|
|
block:
|
|
- name: Stop and disable cinder_scheduler service
|
|
when: cinder_scheduler_enabled|bool
|
|
service: name=openstack-cinder-scheduler state=stopped enabled=no
|
|
- when: step|int == 3
|
|
block:
|
|
- name: Set fact for removal of openstack-cinder package
|
|
set_fact:
|
|
remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages}
|
|
- name: Remove openstack-cinder package if operator requests it
|
|
yum: name=openstack-cinder state=removed
|
|
ignore_errors: True
|
|
when: remove_cinder_package|bool
|
|
fast_forward_upgrade_tasks:
|
|
- name: Check if cinder_scheduler is deployed
|
|
command: systemctl is-enabled --quiet openstack-cinder-scheduler
|
|
ignore_errors: True
|
|
register: cinder_scheduler_enabled_result
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Set fact cinder_scheduler_enabled
|
|
set_fact:
|
|
cinder_scheduler_enabled: "{{ cinder_scheduler_enabled_result.rc == 0 }}"
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Stop openstack-cinder-scheduler
|
|
service: name=openstack-cinder-scheduler state=stopped enabled=no
|
|
when:
|
|
- step|int == 1
|
|
- release == 'ocata'
|
|
- cinder_scheduler_enabled|bool
|