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
)
203 lines
7.5 KiB
YAML
203 lines
7.5 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Sahara service configured with Puppet
|
|
|
|
parameters:
|
|
DockerSaharaApiImage:
|
|
description: image
|
|
type: string
|
|
DockerSaharaConfigImage:
|
|
description: The container image to use for the sahara 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
|
|
|
|
SaharaApiPuppetBase:
|
|
type: ../../puppet/services/sahara-api.yaml
|
|
properties:
|
|
EndpointMap: {get_param: EndpointMap}
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Sahara API role.
|
|
value:
|
|
service_name: {get_attr: [SaharaApiPuppetBase, role_data, service_name]}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [SaharaApiPuppetBase, role_data, config_settings]
|
|
- sahara::sync_db: false
|
|
logging_source: {get_attr: [SaharaApiPuppetBase, role_data, logging_source]}
|
|
logging_groups: {get_attr: [SaharaApiPuppetBase, role_data, logging_groups]}
|
|
service_config_settings: {get_attr: [SaharaApiPuppetBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS #
|
|
puppet_config:
|
|
config_volume: sahara
|
|
puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
|
|
step_config:
|
|
list_join:
|
|
- "\n"
|
|
- - {get_attr: [SaharaApiPuppetBase, role_data, step_config]}
|
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
config_image: {get_param: DockerSaharaConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/sahara-api.json:
|
|
command: /usr/bin/sahara-api --config-file /etc/sahara/sahara.conf
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/lib/sahara
|
|
owner: sahara:sahara
|
|
recurse: true
|
|
- path: /var/log/sahara
|
|
owner: sahara:sahara
|
|
recurse: true
|
|
docker_config:
|
|
step_3:
|
|
sahara_db_sync:
|
|
image: &sahara_api_image {get_param: DockerSaharaApiImage}
|
|
net: host
|
|
privileged: false
|
|
detach: false
|
|
user: root
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/config-data/sahara/etc/sahara/:/etc/sahara/:ro
|
|
- /lib/modules:/lib/modules:ro
|
|
- /var/lib/sahara:/var/lib/sahara
|
|
- /var/log/containers/sahara:/var/log/sahara
|
|
command: "/usr/bin/bootstrap_host_exec sahara_api su sahara -s /bin/bash -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head'"
|
|
step_4:
|
|
sahara_api:
|
|
image: *sahara_api_image
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/sahara-api.json:/var/lib/kolla/config_files/config.json
|
|
- /var/lib/config-data/puppet-generated/sahara/:/var/lib/kolla/config_files/src:ro
|
|
- /lib/modules:/lib/modules:ro
|
|
- /var/lib/sahara:/var/lib/sahara
|
|
- /var/log/containers/sahara:/var/log/sahara
|
|
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/sahara, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/lib/sahara, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/log/sahara, 'setype': svirt_sandbox_file_t }
|
|
- name: sahara logs readme
|
|
copy:
|
|
dest: /var/log/sahara/readme.txt
|
|
content: |
|
|
Log files from sahara containers can be found under
|
|
/var/log/containers/sahara.
|
|
ignore_errors: true
|
|
upgrade_tasks:
|
|
- when: step|int == 0
|
|
tags: common
|
|
block:
|
|
- name: Check if sahara_api is deployed
|
|
command: systemctl is-enabled --quiet openstack-sahara-api
|
|
ignore_errors: True
|
|
register: sahara_api_enabled_result
|
|
- name: Set fact sahara_api_enabled
|
|
set_fact:
|
|
sahara_api_enabled: "{{ sahara_api_enabled_result.rc == 0 }}"
|
|
- when: step|int == 2
|
|
block:
|
|
- name: Stop and disable sahara_api service
|
|
when: sahara_api_enabled|bool
|
|
service: name=openstack-sahara-api state=stopped enabled=no
|
|
- when: step|int == 3
|
|
block:
|
|
- name: Set fact for removal of openstack-sahara-api package
|
|
set_fact:
|
|
remove_sahara_api_package: {get_param: UpgradeRemoveUnusedPackages}
|
|
- name: Remove openstack-sahara-api package if operator requests it
|
|
yum: name=openstack-sahara-api state=removed
|
|
ignore_errors: True
|
|
when: remove_sahara_api_package|bool
|
|
fast_forward_upgrade_tasks:
|
|
- name: FFU check openstack-sahara-api is enabled
|
|
command: systemctl is-enabled openstack-sahara-api
|
|
ignore_errors: True
|
|
register: sahara_api_enabled_result
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Set fact sahara_api_enabled
|
|
set_fact:
|
|
sahara_api_enabled: "{{ sahara_api_enabled_result.rc == 0 }}"
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: FFU stop and disable openstack-sahara-api
|
|
service: name=openstack-sahara-api state=stopped enabled=no
|
|
when:
|
|
- step|int == 1
|
|
- release == 'ocata'
|
|
- sahara_api_enabled|bool
|
|
- name: FFU Sahara package update
|
|
shell: yum -y update openstack-sahara*
|
|
when:
|
|
- step|int == 6
|
|
- is_bootstrap_node|bool
|
|
- name: FFU Sahara db upgrade
|
|
command: sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
|
|
when:
|
|
- step|int == 8
|
|
- is_bootstrap_node|bool
|