Rename service_workflow_tasks into workflow_tasks

Using the service_ prefix seems incoherent with its use in
service_config_settings (vs config_settings).

Change-Id: Ia39f181415bee0071409dabddfa0c5c312915e1f
(cherry picked from commit 09137304b98a02ed024c0288da907cfe35ca5fe1)

2 files changed, 8 insertions, 8 deletions

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 2b004af1..2399b243 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -63,7 +63,7 @@ conditions:
     {%- for role in enabled_roles %}
       - not:
           equals:
-            - get_param: [role_data, {{role.name}}, service_workflow_tasks, step{{step}}]
+            - get_param: [role_data, {{role.name}}, workflow_tasks, step{{step}}]
             - ''
       - False
     {%- endfor %}
@@ -95,7 +95,7 @@ resources:
             _TASKS: {get_file: deploy-steps-tasks.yaml}
 
 {%- for step in range(1, deploy_steps_max) %}
-# BEGIN service_workflow_tasks handling
+# BEGIN workflow_tasks handling
   WorkflowTasks_Step{{step}}:
     type: OS::Mistral::Workflow
     condition: WorkflowTasks_Step{{step}}_Enabled
@@ -111,14 +111,14 @@ resources:
     {%- endfor %}
     {%- endif %}
     properties:
-      name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflowtasks", "step{{step}}"]]}
+      name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflow_tasks", "step{{step}}"]]}
       type: direct
       tasks:
         yaql:
           expression: $.data.where($ != '').select($.get('step{{step}}')).where($ != null).flatten()
           data:
           {%- for role in enabled_roles %}
-            - get_param: [role_data, {{role.name}}, service_workflow_tasks]
+            - get_param: [role_data, {{role.name}}, workflow_tasks]
           {%- endfor %}
 
   WorkflowTasks_Step{{step}}_Execution:
@@ -148,7 +148,7 @@ resources:
                 {%- endfor %}
             evaluate_env: false
       always_update: true
-# END service_workflow_tasks handling
+# END workflow_tasks handling
 {% endfor %}
 
 # Artifacts config and HostPrepConfig is done on all roles, not only
diff --git a/common/services.yaml b/common/services.yaml
index a8186e43..725f4e98 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:
@@ -260,7 +260,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]}
       update_tasks: {get_attr: [UpdateTasks, value]}