12 files changed, 18 insertions, 23 deletions
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 2b004af1..c076a09d 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
@@ -363,8 +363,3 @@ outputs:
               with_sequence: start=0 end={{upgrade_steps_max-1}}
               loop_control:
                 loop_var: step
-            - include: deploy_steps_tasks.yaml
-              with_sequence: start=0 end={{deploy_steps_max-1}}
-              loop_control:
-                loop_var: step
-
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]}
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index d333a032..b60f98c2 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -182,7 +182,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks:
+      workflow_tasks:
         step2:
           - name: ceph_base_ansible_workflow
             workflow: { get_param: CephAnsibleWorkflowName }
diff --git a/docker/services/ceph-ansible/ceph-client.yaml b/docker/services/ceph-ansible/ceph-client.yaml
index 55d8d9da..0b782941 100644
--- a/docker/services/ceph-ansible/ceph-client.yaml
+++ b/docker/services/ceph-ansible/ceph-client.yaml
@@ -54,5 +54,5 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings: {}
diff --git a/docker/services/ceph-ansible/ceph-external.yaml b/docker/services/ceph-ansible/ceph-external.yaml
index f93dd566..bb2fc20a 100644
--- a/docker/services/ceph-ansible/ceph-external.yaml
+++ b/docker/services/ceph-ansible/ceph-external.yaml
@@ -58,7 +58,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         ceph_client_ansible_vars:
           map_merge:
diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/docker/services/ceph-ansible/ceph-mds.yaml
index 4ef3a669..abdb3c3f 100644
--- a/docker/services/ceph-ansible/ceph-mds.yaml
+++ b/docker/services/ceph-ansible/ceph-mds.yaml
@@ -68,7 +68,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_mds.firewall_rules:
diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/docker/services/ceph-ansible/ceph-mon.yaml
index 90149d1e..45f939c2 100644
--- a/docker/services/ceph-ansible/ceph-mon.yaml
+++ b/docker/services/ceph-ansible/ceph-mon.yaml
@@ -71,7 +71,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_mon.firewall_rules:
diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml
index fe7d311d..a441f5c9 100644
--- a/docker/services/ceph-ansible/ceph-osd.yaml
+++ b/docker/services/ceph-ansible/ceph-osd.yaml
@@ -63,7 +63,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_osd.firewall_rules:
diff --git a/docker/services/ceph-ansible/ceph-rgw.yaml b/docker/services/ceph-ansible/ceph-rgw.yaml
index 4bed9b46..4479fdbf 100644
--- a/docker/services/ceph-ansible/ceph-rgw.yaml
+++ b/docker/services/ceph-ansible/ceph-rgw.yaml
@@ -62,7 +62,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
+      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       config_settings:
         map_merge:
         - tripleo.ceph_rgw.firewall_rules:
diff --git a/puppet/services/README.rst b/puppet/services/README.rst
index a593d55e..38e2a280 100644
--- a/puppet/services/README.rst
+++ b/puppet/services/README.rst
@@ -99,12 +99,12 @@ It is also possible to use Mistral actions or workflows together with
 a deployment step, these are executed before the main configuration run.
 To describe actions or workflows from within a service use:
 
-  * service_workflow_tasks: One or more workflow task properties
+  * workflow_tasks: One or more workflow task properties
 
 which expects a map where the key is the step and the value a list of
 dictionaries descrbing each a workflow task, for example::
 
-  service_workflow_tasks:
+  workflow_tasks:
     step2:
       - name: echo
         action: std.echo output=Hello
diff --git a/releasenotes/notes/service_workflow_tasks-4da5830821b7154b.yaml b/releasenotes/notes/workflow_tasks-4da5830821b7154b.yaml
index cf99ec5d..cf99ec5d 100644
--- a/releasenotes/notes/service_workflow_tasks-4da5830821b7154b.yaml
+++ b/releasenotes/notes/workflow_tasks-4da5830821b7154b.yaml
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index e47c1fe9..7b9c08ca 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -31,7 +31,7 @@ envs_containing_endpoint_map = ['tls-endpoints-public-dns.yaml',
                                 'tls-endpoints-public-ip.yaml',
                                 'tls-everywhere-endpoints-dns.yaml']
 ENDPOINT_MAP_FILE = 'endpoint_map.yaml'
-OPTIONAL_SECTIONS = ['service_workflow_tasks']
+OPTIONAL_SECTIONS = ['workflow_tasks']
 REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config',
                             'config_settings', 'step_config']
 OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',