From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 25 Sep 2017 14:44:28 +0000 (+0000)
Subject: Merge "Rename service_workflow_tasks into workflow_tasks" into stable/pike
X-Git-Tag: opnfv-6.0.0~99
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c5a3fe490f1d37abdad28357cd8332fd5a1fe519;p=apex-tripleo-heat-templates.git

Merge "Rename service_workflow_tasks into workflow_tasks" into stable/pike
---

c5a3fe490f1d37abdad28357cd8332fd5a1fe519
diff --cc common/services.yaml
index b55a5c4a,725f4e98..a0015c7e
--- a/common/services.yaml
+++ b/common/services.yaml
@@@ -270,10 -260,9 +270,10 @@@ 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]}
        update_tasks: {get_attr: [UpdateTasks, value]}
        upgrade_batch_tasks: {get_attr: [UpgradeBatchTasks, value]}
        service_metadata_settings: {get_attr: [ServiceServerMetadataHook, metadata]}