aboutsummaryrefslogtreecommitdiffstats
path: root/common/services.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-25 14:44:28 +0000
committerGerrit Code Review <review@openstack.org>2017-09-25 14:44:28 +0000
commitc5a3fe490f1d37abdad28357cd8332fd5a1fe519 (patch)
tree783e0b9aad40d17d078bd6c28da6de50ffdaa194 /common/services.yaml
parent06aa582cfd312d9381369ddd28d190145becc10b (diff)
parentc7691a1e97a448848d209db3bb0ddd5fe1069669 (diff)
Merge "Rename service_workflow_tasks into workflow_tasks" into stable/pike
Diffstat (limited to 'common/services.yaml')
-rw-r--r--common/services.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/services.yaml b/common/services.yaml
index b55a5c4a..a0015c7e 100644
--- a/common/services.yaml
+++ b/common/services.yaml
@@ -174,13 +174,13 @@ resources:
expression: coalesce($.data.role_data, []).where($ != null).select($.get('service_config_settings')).where($ != null).reduce($1.mergeWith($2), {})
data: {role_data: {get_attr: [ServiceChain, role_data]}}
- ServiceWorkflowTasks:
+ WorkflowTasks:
type: OS::Heat::Value
properties:
type: json
value:
yaql:
- expression: coalesce($.data.role_data, []).where($ != null).select($.get('service_workflow_tasks')).where($ != null).reduce($1.mergeWith($2), {})
+ expression: coalesce($.data.role_data, []).where($ != null).select($.get('workflow_tasks')).where($ != null).reduce($1.mergeWith($2), {})
data: {role_data: {get_attr: [ServiceChain, role_data]}}
UpgradeTasks:
@@ -270,7 +270,7 @@ outputs:
config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
global_config_settings: {get_attr: [GlobalConfigSettings, value]}
service_config_settings: {get_attr: [ServiceConfigSettings, value]}
- service_workflow_tasks: {get_attr: [ServiceWorkflowTasks, value]}
+ workflow_tasks: {get_attr: [WorkflowTasks, value]}
step_config: {get_attr: [PuppetStepConfig, value]}
upgrade_tasks: {get_attr: [UpgradeTasks, value]}
post_upgrade_tasks: {get_attr: [PostUpgradeTasks, value]}