Merge "modify something in 'dsl_v2.rst'"

This commit is contained in:
Jenkins 2016-12-08 10:20:36 +00:00 committed by Gerrit Code Review
commit a7c4143efe

View File

@ -752,8 +752,8 @@ std.email
Sends an email message via SMTP protocol. Sends an email message via SMTP protocol.
- **to_addrs** - Comma separated list of recipients. *Required*. - **to_addrs** - Comma separated list of recipients. *Required*.
- **subject** - Subject of the message. *Required*. - **subject** - Subject of the message. *Optional*.
- **body** - Text containing message body. *Required*. - **body** - Text containing message body. *Optional*.
- **from_addr** - Sender email address. *Required*. - **from_addr** - Sender email address. *Required*.
- **smtp_server** - SMTP server host name. *Required*. - **smtp_server** - SMTP server host name. *Required*.
- **smtp_password** - SMTP server password. *Required*. - **smtp_password** - SMTP server password. *Required*.
@ -789,11 +789,11 @@ Input parameters:
executed. *Required*. executed. *Required*.
- **host** - Host name that the command needs to be executed on. - **host** - Host name that the command needs to be executed on.
*Required*. *Required*.
- **username** - User name to authenticate on the host. - **username** - User name to authenticate on the host. *Required*.
- **password** - User password to to authenticate on the host. *Optional.* - **password** - User password to to authenticate on the host. *Optional*.
- **private_key_filename** - Private key file name which will be used for authentication on remote host. - **private_key_filename** - Private key file name which will be used for authentication on remote host.
All private keys should be on executor host in **<home-user-directory>/.ssh/**. All private keys should be on executor host in **<home-user-directory>/.ssh/**.
**<home-user-directory>** should refer to user directory under which service is running. *Optional.* **<home-user-directory>** should refer to user directory under which service is running. *Optional*.
**NOTE**: Authentication using key pairs is supported, key should be **NOTE**: Authentication using key pairs is supported, key should be
on Mistral Executor server machine. on Mistral Executor server machine.