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
)
189 lines
6.9 KiB
YAML
189 lines
6.9 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack containerized Heat API CFN service
|
|
|
|
parameters:
|
|
DockerHeatApiCfnImage:
|
|
description: image
|
|
type: string
|
|
# puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn
|
|
DockerHeatApiCfnConfigImage:
|
|
description: The container image to use for the heat_api_cfn 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
|
|
EnableInternalTLS:
|
|
type: boolean
|
|
default: false
|
|
|
|
conditions:
|
|
|
|
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ./containers-common.yaml
|
|
|
|
HeatBase:
|
|
type: ../../puppet/services/heat-api-cfn.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}
|
|
|
|
HeatApiCfnLogging:
|
|
type: OS::TripleO::Services::Logging::HeatApiCfn
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Heat API CFN role.
|
|
value:
|
|
service_name: {get_attr: [HeatBase, role_data, service_name]}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [HeatBase, role_data, config_settings]
|
|
- get_attr: [HeatApiCfnLogging, config_settings]
|
|
- apache::default_vhost: false
|
|
logging_source: {get_attr: [HeatBase, role_data, logging_source]}
|
|
logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
|
|
service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: heat_api_cfn
|
|
puppet_tags: heat_config,file,concat,file_line
|
|
step_config:
|
|
get_attr: [HeatBase, role_data, step_config]
|
|
config_image: {get_param: DockerHeatApiCfnConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/heat_api_cfn.json:
|
|
command: /usr/sbin/httpd -DFOREGROUND
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/log/heat
|
|
owner: heat:heat
|
|
recurse: true
|
|
docker_config:
|
|
step_2:
|
|
get_attr: [HeatApiCfnLogging, docker_config, step_2]
|
|
step_4:
|
|
heat_api_cfn:
|
|
image: {get_param: DockerHeatApiCfnImage}
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
# NOTE(mandre) kolla image changes the user to 'heat', we need it
|
|
# to be root to run httpd
|
|
user: root
|
|
healthcheck:
|
|
test: /openstack/healthcheck
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
- {get_attr: [HeatApiCfnLogging, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/heat_api_cfn/:/var/lib/kolla/config_files/src:ro
|
|
-
|
|
if:
|
|
- internal_tls_enabled
|
|
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
|
|
- ''
|
|
-
|
|
if:
|
|
- internal_tls_enabled
|
|
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
|
|
- ''
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
host_prep_tasks: {get_attr: [HeatApiCfnLogging, host_prep_tasks]}
|
|
upgrade_tasks:
|
|
- when: step|int == 0
|
|
tags: common
|
|
block:
|
|
- name: Check if heat_api_cfn is deployed
|
|
command: systemctl is-enabled --quiet openstack-heat-api-cfn
|
|
ignore_errors: True
|
|
register: heat_api_cfn_enabled_result
|
|
- set_fact:
|
|
heat_api_cfn_enabled: heat_api_cfn_enabled_result|bool
|
|
- name: Check for heat_api_cfn running under apache
|
|
shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_cfn_wsgi"
|
|
ignore_errors: True
|
|
register: heat_api_cfn_httpd_enabled_result
|
|
- set_fact:
|
|
heat_api_cfn_httpd_enabled: "{{ heat_api_cfn_httpd_enabled_result.rc == 0 }}"
|
|
- name: Check if httpd service is running
|
|
command: systemctl is-active --quiet httpd
|
|
ignore_errors: True
|
|
register: httpd_running_result
|
|
when: httpd_running is undefined
|
|
- set_fact:
|
|
httpd_running: "{{ httpd_running_result.rc == 0 }}"
|
|
when: httpd_running is undefined
|
|
- when: step|int == 2
|
|
block:
|
|
- name: Stop and disable heat_api_cfn service (pre-upgrade not under httpd)
|
|
service: name=openstack-heat-api-cfn state=stopped enabled=no
|
|
when:
|
|
- heat_api_cfn_enabled|bool
|
|
- name: Stop heat_api_cfn service (running under httpd)
|
|
service: name=httpd state=stopped enabled=no
|
|
when:
|
|
- heat_api_cfn_httpd_enabled|bool
|
|
- httpd_running|bool
|
|
metadata_settings:
|
|
get_attr: [HeatBase, role_data, metadata_settings]
|
|
fast_forward_upgrade_tasks:
|
|
- name: FFU check if openstack-heat-api-cfn service is enabled
|
|
command: systemctl is-enabled openstack-heat-api-cfn
|
|
ignore_errors: True
|
|
register: heat_api_cfn_enabled_result
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Set fact heat_api_cfn_enabled
|
|
set_fact:
|
|
heat_api_cfn_enabled: "{{ heat_api_cfn_enabled_result.rc == 0 }}"
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: FFU stop and disable openstack-heat-api-cfn service
|
|
when:
|
|
- step|int == 1
|
|
- release == 'ocata'
|
|
- heat_api_cfn_enabled|bool
|
|
service: name=openstack-heat-api-cfn state=stopped enabled=no
|