openstack/mistral
Code Issues Proposed changes

Merge "Fix a syntax error in yaml example"

Browse Source
This commit is contained in:
Jenkins 2016-12-08 10:42:47 +00:00 committed by Gerrit Code Review
commit 8aa7125a4b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/dsl/dsl_v2.rst
View File

@ -78,14 +78,14 @@ YAML example
create_vm: create_vm:
  description: Simple workflow example   description: Simple workflow example
  type: direct   type: direct
 
input: input:
    - vm_name     - vm_name
    - image_ref     - image_ref
    - flavor_ref     - flavor_ref
  output:   output:
    vm_id: <% $.vm_id %>     vm_id: <% $.vm_id %>
 
tasks: tasks:
    create_server:     create_server:
      action: nova.servers_create name=<% $.vm_name %> image=<% $.image_ref %> flavor=<% $.flavor_ref %>       action: nova.servers_create name=<% $.vm_name %> image=<% $.image_ref %> flavor=<% $.flavor_ref %>
@ -188,7 +188,7 @@ attributes:
- **description** - Arbitrary text containing task description. - **description** - Arbitrary text containing task description.
*Optional*. *Optional*.
- **action** - Name of the action associated with the task. - **action** - Name of the action associated with the task.
*Mutually exclusive with* **workflow**. If neither action nor workflow are *Mutually exclusive with* **workflow**. If neither action nor workflow are
provided then the action 'std.noop' will be used. provided then the action 'std.noop' will be used.
- **workflow** - Name of the workflow associated with the task. - **workflow** - Name of the workflow associated with the task.
@ -318,7 +318,7 @@ Full syntax:
my_task: my_task:
  action: std.http   action: std.http
  input:   input:
     url: http://mywebsite.org url: http://mywebsite.org
    method: GET     method: GET
Simplified syntax: Simplified syntax:
@ -599,7 +599,7 @@ YAML example
version: '2.0' version: '2.0'
create_vms: create_vms:
 description: Creating multiple virtual servers using "with-items".   description: Creating multiple virtual servers using "with-items".
 input:  input:
   - vm_names    - vm_names
@ -772,7 +772,7 @@ Example:
        -- Thanks, Mistral Team.         -- Thanks, Mistral Team.
      from_addr: mistral@openstack.org       from_addr: mistral@openstack.org
      smtp_server: smtp.google.com       smtp_server: smtp.google.com
      smtp_password: SECRET        smtp_password: SECRET
The syntax of 'std.emal' action is pretty verbose. However, it can be The syntax of 'std.emal' action is pretty verbose. However, it can be
significantly simplified using Ad-hoc actions. More about them significantly simplified using Ad-hoc actions. More about them