9118472dc6
Update healthcheck commands that probe oslo's messaging port to use the
RpcPort parameter. Previously, some templates referenced the service's
own 'rabbit_port' config setting, which led to malformed healthcheck
commands when the 'rabbit_port' settings were deprecated.
Update the templates that looked up the port in the RabbitMQService's
global_config_settings. Not only did this break the oslo abstraction
by referring to a specific messaging backend (rabbit), it broke
split-stack deployments in which the RabbitMQService is not actually
deployed on the secondary stack's nodes.
This patch creates a common healthcheck command using the RpcPort
parameter in containers-common.yaml. This allows other templates to
reference a common healthcheck command. Other templates that should
also use this can be cleaned up in a separate patch.
Closes-Bug: #1825342
Change-Id: I0d3974089ae6e6879adab4852715c7a1c1188f7c
(cherry picked from commit c5fe51147b)
Conflicts:
deployment/heat/heat-engine-container-puppet.yaml
deployment/nova/nova-compute-container-puppet.yaml
deployment/nova/nova-ironic-container-puppet.yaml
deployment/nova/nova-scheduler-container-puppet.yaml
301 lines
11 KiB
YAML
301 lines
11 KiB
YAML
heat_template_version: rocky
|
|
|
|
description: >
|
|
OpenStack containerized Heat Engine service
|
|
|
|
parameters:
|
|
DockerHeatEngineImage:
|
|
description: image
|
|
type: string
|
|
DockerHeatConfigImage:
|
|
description: The container image to use for the heat config_volume
|
|
type: string
|
|
HeatEngineLoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.heat.engine
|
|
path: /var/log/containers/heat/heat-engine.log
|
|
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
|
|
HeatEngineOptVolumes:
|
|
default: []
|
|
description: list of optional volumes to be mounted
|
|
type: comma_delimited_list
|
|
HeatEngineOptEnvVars:
|
|
default: []
|
|
description: list of optional environment variables
|
|
type: comma_delimited_list
|
|
HeatEnableDBPurge:
|
|
type: boolean
|
|
default: true
|
|
description: |
|
|
Whether to create cron job for purging soft deleted rows in the Heat database.
|
|
HeatWorkers:
|
|
default: 0
|
|
description: Number of workers for Heat service.
|
|
type: number
|
|
HeatMaxNestedStackDepth:
|
|
default: 6
|
|
description: Maximum number of nested stack depth.
|
|
type: number
|
|
HeatReauthenticationAuthMethod:
|
|
description: Allow reauthentication on token expiry, such that long-running tasks
|
|
may complete. Note this defeats the expiry of any provided user tokens.
|
|
type: string
|
|
default: ''
|
|
constraints:
|
|
- allowed_values: [ '', 'trusts' ]
|
|
HeatPassword:
|
|
description: The password for the Heat service and db account, used by the Heat services.
|
|
type: string
|
|
hidden: true
|
|
HeatStackDomainAdminPassword:
|
|
description: Password for heat_stack_domain_admin user.
|
|
type: string
|
|
hidden: true
|
|
HeatAuthEncryptionKey:
|
|
description: Auth encryption key for heat-engine
|
|
type: string
|
|
hidden: true
|
|
default: ''
|
|
MonitoringSubscriptionHeatEngine:
|
|
default: 'overcloud-heat-engine'
|
|
type: string
|
|
HeatConvergenceEngine:
|
|
type: boolean
|
|
default: true
|
|
description: Enables the heat engine with the convergence architecture.
|
|
HeatMaxResourcesPerStack:
|
|
type: number
|
|
default: 1000
|
|
description: Maximum resources allowed per top-level stack. -1 stands for unlimited.
|
|
HeatEnginePluginDirs:
|
|
type: comma_delimited_list
|
|
default: []
|
|
description: An array of directories to search for plug-ins.
|
|
|
|
conditions:
|
|
heat_workers_unset: {equals : [{get_param: HeatWorkers}, 0]}
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ../containers-common.yaml
|
|
|
|
MySQLClient:
|
|
type: ../database/mysql-client.yaml
|
|
|
|
HeatBase:
|
|
type: ./heat-base-puppet.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}
|
|
|
|
HeatEngineLogging:
|
|
type: OS::TripleO::Services::Logging::HeatEngine
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Heat Engine role.
|
|
value:
|
|
service_name: heat_engine
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionHeatEngine}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [HeatBase, role_data, config_settings]
|
|
- apache::default_vhost: false
|
|
heat::engine::configure_delegated_roles: false
|
|
heat::engine::trusts_delegated_roles: []
|
|
heat::engine::max_nested_stack_depth: {get_param: HeatMaxNestedStackDepth}
|
|
heat::engine::max_resources_per_stack: {get_param: HeatMaxResourcesPerStack}
|
|
heat::engine::reauthentication_auth_method: {get_param: HeatReauthenticationAuthMethod}
|
|
heat::engine::heat_metadata_server_url:
|
|
make_url:
|
|
scheme: {get_param: [EndpointMap, HeatCfnPublic, protocol]}
|
|
host: {get_param: [EndpointMap, HeatCfnPublic, host]}
|
|
port: {get_param: [EndpointMap, HeatCfnPublic, port]}
|
|
heat::engine::heat_waitcondition_server_url:
|
|
make_url:
|
|
scheme: {get_param: [EndpointMap, HeatCfnPublic, protocol]}
|
|
host: {get_param: [EndpointMap, HeatCfnPublic, host]}
|
|
port: {get_param: [EndpointMap, HeatCfnPublic, port]}
|
|
path: /v1/waitcondition
|
|
heat::engine::convergence_engine: {get_param: HeatConvergenceEngine}
|
|
tripleo::profile::base::heat::manage_db_purge: {get_param: HeatEnableDBPurge}
|
|
heat::database_connection:
|
|
make_url:
|
|
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
|
|
username: heat
|
|
password: {get_param: HeatPassword}
|
|
host: {get_param: [EndpointMap, MysqlInternal, host]}
|
|
path: /heat
|
|
query:
|
|
read_default_file: /etc/my.cnf.d/tripleo.cnf
|
|
read_default_group: tripleo
|
|
heat::keystone_ec2_uri:
|
|
list_join:
|
|
- ''
|
|
- - {get_param: [EndpointMap, KeystoneV3Internal, uri]}
|
|
- '/ec2tokens'
|
|
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
|
|
heat::engine::auth_encryption_key:
|
|
yaql:
|
|
expression: $.data.passwords.where($ != '').first()
|
|
data:
|
|
passwords:
|
|
- {get_param: HeatAuthEncryptionKey}
|
|
- {get_param: [DefaultPasswords, heat_auth_encryption_key]}
|
|
heat::engine::plugin_dirs: {get_param: HeatEnginePluginDirs}
|
|
-
|
|
if:
|
|
- heat_workers_unset
|
|
- {}
|
|
- heat::engine::num_engine_workers: {get_param: HeatWorkers}
|
|
service_config_settings:
|
|
|
|
fluentd:
|
|
tripleo_fluentd_groups_heat_engine:
|
|
- heat
|
|
tripleo_fluentd_sources_heat_engine:
|
|
- {get_param: HeatEngineLoggingSource}
|
|
mysql:
|
|
heat::db::mysql::password: {get_param: HeatPassword}
|
|
heat::db::mysql::user: heat
|
|
heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
|
heat::db::mysql::dbname: heat
|
|
heat::db::mysql::allowed_hosts:
|
|
- '%'
|
|
- "%{hiera('mysql_bind_host')}"
|
|
keystone:
|
|
map_merge:
|
|
- get_attr: [HeatBase, role_data, service_config_settings, keystone]
|
|
- tripleo::profile::base::keystone::heat_admin_password: {get_param: HeatStackDomainAdminPassword}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: heat
|
|
puppet_tags: heat_config,file,concat,file_line
|
|
step_config:
|
|
list_join:
|
|
- "\n"
|
|
- - include ::tripleo::profile::base::heat::engine
|
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
config_image: {get_param: DockerHeatConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/heat_engine.json:
|
|
command:
|
|
list_join:
|
|
- ' '
|
|
- - /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
|
|
- get_attr: [HeatEngineLogging, cmd_extra_args]
|
|
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:
|
|
# db sync runs before permissions set by kolla_config
|
|
step_2:
|
|
get_attr: [HeatEngineLogging, docker_config, step_2]
|
|
step_3:
|
|
heat_engine_db_sync:
|
|
image: &heat_engine_image {get_param: DockerHeatEngineImage}
|
|
net: host
|
|
privileged: false
|
|
detach: false
|
|
user: root
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
- {get_attr: [HeatEngineLogging, volumes]}
|
|
-
|
|
- /var/lib/config-data/heat/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
|
|
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
|
|
command: "/usr/bin/bootstrap_host_exec heat_engine su heat -s /bin/bash -c 'heat-manage db_sync'"
|
|
step_4:
|
|
heat_engine:
|
|
image: *heat_engine_image
|
|
net: host
|
|
privileged: false
|
|
stop_grace_period: 60
|
|
restart: always
|
|
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
- {get_attr: [HeatEngineLogging, volumes]}
|
|
- {get_param: HeatEngineOptVolumes}
|
|
-
|
|
- /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/heat/:/var/lib/kolla/config_files/src:ro
|
|
environment:
|
|
list_concat:
|
|
- {get_param: HeatEngineOptEnvVars}
|
|
-
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
host_prep_tasks:
|
|
list_concat:
|
|
- {get_attr: [HeatEngineLogging, host_prep_tasks]}
|
|
- - name: enable virt_sandbox_use_netlink for healthcheck
|
|
seboolean:
|
|
name: virt_sandbox_use_netlink
|
|
persistent: yes
|
|
state: yes
|
|
upgrade_tasks: []
|
|
post_upgrade_tasks:
|
|
- when: step|int == 1
|
|
import_role:
|
|
name: tripleo-docker-rm
|
|
vars:
|
|
containers_to_rm:
|
|
- heat_engine
|
|
fast_forward_upgrade_tasks:
|
|
- when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
block:
|
|
- name: FFU check if openstack-heat-engine is enabled
|
|
command: systemctl is-enabled --quiet openstack-heat-engine
|
|
ignore_errors: True
|
|
register: heat_engine_enabled_result
|
|
- name: Set fact heat_engine_enabled
|
|
set_fact:
|
|
heat_engine_enabled: "{{ heat_engine_enabled_result.rc == 0 }}"
|
|
- name: FFU stop and disable openstack-heat-engine service
|
|
when:
|
|
- step|int == 1
|
|
- release == 'ocata'
|
|
- heat_engine_enabled|bool
|
|
service: name=openstack-heat-engine state=stopped enabled=no
|