X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fpuppet-steps.j2;h=f7651a57da981ea0e36650b28aa9a5ec51a69f55;hb=e3f5da81aed9e56be31facfa7aaae881a481e889;hp=5567d65d8c975fc4a462e8ed4e644d98cefdc99f;hpb=cb0ae4a630f69bc8d2899f02f1e5ee98daa48ffc;p=apex-tripleo-heat-templates.git

diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index 5567d65d..f7651a57 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -1,3 +1,18 @@
+{% set deploy_steps_max = 6 %}
+conditions:
+{% for step in range(1, deploy_steps_max) %}
+  WorkflowTasks_Step{{step}}_Enabled:
+    or:
+    {%- for role in roles %}
+      - not:
+          equals:
+            - get_param: [role_data, {{role.name}}, service_workflow_tasks, step{{step}}]
+            - ''
+      - False
+    {%- endfor %}
+{% endfor %}
+
+resources:
   # Post deployment steps for all roles
   # A single config is re-applied with an incrementing step number
 {% for role in roles %}
@@ -8,6 +23,7 @@
   {{role.name}}ArtifactsDeploy:
     type: OS::Heat::StructuredDeployments
     properties:
+      name: {{role.name}}ArtifactsDeploy
       servers:  {get_param: [servers, {{role.name}}]}
       config: {get_resource: {{role.name}}ArtifactsConfig}
 
@@ -21,20 +37,29 @@
   {{role.name}}Config:
     type: OS::TripleO::{{role.name}}Config
     properties:
-      StepConfig: {list_join: ["\n", {get_param: [role_data, {{role.name}}, step_config]}]}
+      StepConfig: {get_param: [role_data, {{role.name}}, step_config]}
 
   # Step through a series of configuration steps
-{% for step in range(1, 6) %}
+{% for step in range(1, deploy_steps_max) %}
   {{role.name}}Deployment_Step{{step}}:
     type: OS::Heat::StructuredDeploymentGroup
-  {% if step == 1 %}
-    depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
-  {% else %}
     depends_on:
-    {% for dep in roles %}
+      - WorkflowTasks_Step{{step}}_Execution
+    # TODO(gfidente): the following if/else condition
+    # replicates what is already defined for the
+    # WorkflowTasks_StepX resource and can be remove
+    # if https://bugs.launchpad.net/heat/+bug/1700569
+    # is fixed.
+    {%- if step == 1 %}
+    {%- for dep in roles %}
+      - {{dep.name}}PreConfig
+      - {{dep.name}}ArtifactsDeploy
+    {%- endfor %}
+    {%- else %}
+    {%- for dep in roles %}
       - {{dep.name}}Deployment_Step{{step -1}}
-    {% endfor %}
-  {% endif %}
+    {%- endfor %}
+    {%- endif %}
     properties:
       name: {{role.name}}Deployment_Step{{step}}
       servers: {get_param: [servers, {{role.name}}]}
@@ -49,9 +74,9 @@
   # after all the previous deployment steps.
   {{role.name}}ExtraConfigPost:
     depends_on:
-  {% for dep in roles %}
+  {%- for dep in roles %}
       - {{dep.name}}Deployment_Step5
-  {% endfor %}
+  {%- endfor %}
     type: OS::TripleO::NodeExtraConfigPost
     properties:
         servers: {get_param: [servers, {{role.name}}]}
@@ -62,9 +87,9 @@
   {{role.name}}PostConfig:
     type: OS::TripleO::Tasks::{{role.name}}PostConfig
     depends_on:
-  {% for dep in roles %}
+  {%- for dep in roles %}
       - {{dep.name}}ExtraConfigPost
-  {% endfor %}
+  {%- endfor %}
     properties:
       servers: {get_param: servers}
       input_values:
@@ -72,3 +97,60 @@
 
 
 {% endfor %}
+
+# BEGIN service_workflow_tasks handling
+{% for step in range(1, deploy_steps_max) %}
+  WorkflowTasks_Step{{step}}:
+    type: OS::Mistral::Workflow
+    condition: WorkflowTasks_Step{{step}}_Enabled
+    depends_on:
+    {%- if step == 1 %}
+    {%- for dep in roles %}
+      - {{dep.name}}PreConfig
+      - {{dep.name}}ArtifactsDeploy
+    {%- endfor %}
+    {%- else %}
+    {%- for dep in roles %}
+      - {{dep.name}}Deployment_Step{{step -1}}
+    {%- endfor %}
+    {%- endif %}
+    properties:
+      name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflowtasks", "step{{step}}"]]}
+      type: direct
+      tasks:
+        yaql:
+          expression: $.data.where($ != '').select($.get('step{{step}}')).where($ != null).flatten()
+          data:
+          {%- for role in roles %}
+            - get_param: [role_data, {{role.name}}, service_workflow_tasks]
+          {%- endfor %}
+
+  WorkflowTasks_Step{{step}}_Execution:
+    type: OS::Mistral::ExternalResource
+    condition: WorkflowTasks_Step{{step}}_Enabled
+    depends_on: WorkflowTasks_Step{{step}}
+    properties:
+      actions:
+        CREATE:
+          workflow: { get_resource: WorkflowTasks_Step{{step}} }
+          params:
+            env:
+              service_ips: { get_param: ctlplane_service_ips }
+              role_merged_configs:
+                {%- for r in roles %}
+                {{r.name}}: {get_param: [role_data, {{r.name}}, merged_config_settings]}
+                {%- endfor %}
+            evaluate_env: false
+        UPDATE:
+          workflow: { get_resource: WorkflowTasks_Step{{step}} }
+          params:
+            env:
+              service_ips: { get_param: ctlplane_service_ips }
+              role_merged_configs:
+                {%- for r in roles %}
+                {{r.name}}: {get_param: [role_data, {{r.name}}, merged_config_settings]}
+                {%- endfor %}
+            evaluate_env: false
+      always_update: true
+{% endfor %}
+# END service_workflow_tasks handling