From b4b0513f1fb77d917d93aefdb43de906da7f96c6 Mon Sep 17 00:00:00 2001
From: Fedor Zhadaev <fzhadaev@mirantis.com>
Date: Mon, 18 Apr 2016 08:43:34 +0300
Subject: [PATCH] Change default deployment tasks version to 2.0.0

Change-Id: I0f1932bb30f143e7c9147f1063a430fbc38d0b7e
Closes-Bug: #1570770
---
 .../v4/plugin_data/deployment_tasks.yaml.mako | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/fuel_plugin_builder/templates/v4/plugin_data/deployment_tasks.yaml.mako b/fuel_plugin_builder/templates/v4/plugin_data/deployment_tasks.yaml.mako
index 04bc638..e1742dd 100644
--- a/fuel_plugin_builder/templates/v4/plugin_data/deployment_tasks.yaml.mako
+++ b/fuel_plugin_builder/templates/v4/plugin_data/deployment_tasks.yaml.mako
@@ -11,21 +11,18 @@
 - id: ${plugin_name}-deployment-puppet
   type: puppet
   role: [${plugin_name}_role]
-  requires: [deploy_start]
-  required_for: [deploy_end]
 
-## If you want to use task-based deployment that is introduced as experimental
-## in fuel v8.0 uncomment code section below this comment and uncomment similar
-## sections in tasks below.
-## See the example:
-## https://github.com/openstack/fuel-plugins/tree/master/examples/fuel_plugin_example_v4_experimental
-## for more details.
+# If you do not want to use task-based deployment that is introduced as experimental
+# in fuel v8.0 comment code section below this comment, uncomment two lines below it
+# and do the same for tasks below.
 
-#  version: 2.0.0              # tasks v2.0.0 is supporting task-based deployment
-#   cross-depends:
-#     - name: deploy_start
-#   cross-depended-by:
-#     - name: deploy_end
+  version: 2.0.0
+  cross-depends:
+    - name: deploy_start
+  cross-depended-by:
+    - name: deploy_end
+#  requires: [deploy_start] # version 1.0.0
+#  required_for: [deploy_end]
 
   parameters:
     puppet_manifest: "deploy.pp"
@@ -33,16 +30,15 @@
     timeout: 3600
 
 #- id: ${plugin_name}-post-deployment-sh
-#  version: 2.0.0
 #  type: shell
 #  role: [${plugin_name}_role]
-#  requires: [post_deployment_start]
-#  required_for: [post_deployment_end]
-##  version: 2.0.0
-##  cross-depends:
-##    - name: post_deployment_start
-##  cross-depended-by:
-##    - name: post_deployment_end
+#  version: 2.0.0
+#  cross-depends:
+#    - name: post_deployment_start
+#  cross-depended-by:
+#    - name: post_deployment_end
+# #  requires: [post_deployment_start]
+# #  required_for: [post_deployment_end]
 #  parameters:
 #    cmd: echo post_deployment_task_executed > /tmp/post_deployment
 #    retries: 3
@@ -50,16 +46,15 @@
 #    timeout: 180
 
 #- id: ${plugin_name}-pre-deployment-sh
-#  version: 2.0.0
 #  type: shell
 #  role: [${plugin_name}_role]
-#  requires: [pre_deployment_start]
-#  required_for: [pre_deployment_end]
-##  version: 2.0.0
-##  cross-depends:
-##    - name: pre_deployment_start
-##  cross-depended-by:
-##    - name: pre_deployment_end
+#  version: 2.0.0
+#  cross-depends:
+#    - name: pre_deployment_start
+#  cross-depended-by:
+#    - name: pre_deployment_end
+# #  requires: [pre_deployment_start]
+# #  required_for: [pre_deployment_end]
 #  parameters:
 #    cmd: echo pre_deployment_task_executed > /tmp/pre_deployment
 #    retries: 3