openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Adding HeatEngineVolumes and HeatEngineOptEnvVars support"

Browse Source
This commit is contained in:
Zuul 2018-06-23 01:15:48 +00:00 committed by Gerrit Code Review
commit 0605128922
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/services/heat-engine.yaml
View File

@ -41,6 +41,14 @@ parameters:
default: {} default: {}
description: Parameters specific to the role description: Parameters specific to the role
type: json 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
resources: resources:
@ -139,11 +147,15 @@ outputs:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- {get_attr: [HeatEngineLogging, 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/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 - /var/lib/config-data/puppet-generated/heat/:/var/lib/kolla/config_files/src:ro
environment: environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS list_concat:
- {get_param: HeatEngineOptEnvVars}
-
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: {get_attr: [HeatEngineLogging, host_prep_tasks]} host_prep_tasks: {get_attr: [HeatEngineLogging, host_prep_tasks]}
upgrade_tasks: upgrade_tasks:
- when: step|int == 0 - when: step|int == 0