openstack
/
fuel-plugins
Code Issues Proposed changes

Merge "Change default deployment tasks version to 2.0.0"

This commit is contained in:
Jenkins 2016-05-12 14:04:43 +00:00 committed by Gerrit Code Review
parent 9737039e70 b4b0513f1f
commit bd16170b6c
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fuel_plugin_builder/templates/v4/plugin_data/deployment_tasks.yaml.mako
View File

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