From 2ce77d627e34957fac31f1a8a05406d188a2a5b7 Mon Sep 17 00:00:00 2001 From: Ilya Kutukov Date: Tue, 20 Sep 2016 14:30:30 +0300 Subject: [PATCH] tasks.yaml was commented for plugin example v3 Task from tasks.yaml in example v3 was running example.pp the second time and this have been fixed. Change-Id: Ic4263cc7998f9bba9f0144ddc46613d30fa5c002 Closes-Bug: #1625244 --- examples/fuel_plugin_example_v3/tasks.yaml | 46 +++------------------- examples/fuel_plugin_example_v4/tasks.yaml | 46 +--------------------- 2 files changed, 6 insertions(+), 86 deletions(-) diff --git a/examples/fuel_plugin_example_v3/tasks.yaml b/examples/fuel_plugin_example_v3/tasks.yaml index e8b40e3..d110cb3 100644 --- a/examples/fuel_plugin_example_v3/tasks.yaml +++ b/examples/fuel_plugin_example_v3/tasks.yaml @@ -1,43 +1,7 @@ -# This tasks will be applied on controller nodes -- role: ['primary-controller', 'controller'] - stage: post_deployment - type: shell - parameters: - cmd: bash deploy.sh - timeout: 42 +# WARNING: `tasks.yaml` will be deprecated in further releases. +# Please, use `deployment_tasks.yaml` to describe tasks instead. -- role: '*' - stage: pre_deployment/100 - type: shell - parameters: - cmd: echo all > /tmp/plugin+100.all - timeout: 42 +# This file is left only as an example of what you could +# meet during plugins development and support. -- role: '*' - stage: pre_deployment/+101.0 - type: shell - parameters: - cmd: echo all > /tmp/plugin+100.0.all - timeout: 42 - -- role: '*' - stage: pre_deployment/-100 - type: shell - parameters: - cmd: echo all > /tmp/plugin-100.all - timeout: 42 - -- role: [compute] - stage: pre_deployment/-101 - type: puppet - parameters: - puppet_manifest: "deploy.pp" - puppet_modules: "." - timeout: 3600 - retries: 2 - -- role: '*' - stage: pre_deployment - type: reboot - parameters: - timeout: 600 +[] \ No newline at end of file diff --git a/examples/fuel_plugin_example_v4/tasks.yaml b/examples/fuel_plugin_example_v4/tasks.yaml index 657bc5e..a29a79b 100644 --- a/examples/fuel_plugin_example_v4/tasks.yaml +++ b/examples/fuel_plugin_example_v4/tasks.yaml @@ -1,49 +1,5 @@ # WARNING: `tasks.yaml` will be deprecated in further releases. # Please, use `deployment_tasks.yaml` to describe tasks instead. -# This file is left only as an example of the old tasks format what you could +# This file is left only as an example of what you could # meet during plugins development and support. - -## This tasks will be applied on controller nodes -#- role: ['primary-controller', 'controller'] -# stage: post_deployment -# type: shell -# parameters: -# cmd: bash deploy.sh -# timeout: 42 -# -#- role: '*' -# stage: pre_deployment/100 -# type: shell -# parameters: -# cmd: echo all > /tmp/plugin+100.all -# timeout: 42 -# -#- role: '*' -# stage: pre_deployment/+101.0 -# type: shell -# parameters: -# cmd: echo all > /tmp/plugin+100.0.all -# timeout: 42 -# -#- role: '*' -# stage: pre_deployment/-100 -# type: shell -# parameters: -# cmd: echo all > /tmp/plugin-100.all -# timeout: 42 -# -#- role: [compute] -# stage: pre_deployment/-101 -# type: puppet -# parameters: -# puppet_manifest: "deploy.pp" -# puppet_modules: "." -# timeout: 3600 -# retries: 2 -# -#- role: '*' -# stage: pre_deployment -# type: reboot -# parameters: -# timeout: 600