ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hashicorp/terraform

This commit is contained in:
stack72 2017-03-07 15:28:39 +02:00
parent 61c101da29 0801f38fce
commit 4d7a172fa6
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
website/source/docs/providers/consul/r/catalog_entry.html.markdown
View File

@ -3,13 +3,13 @@ layout: "consul"
page_title: "Consul: consul_catalog_entry" page_title: "Consul: consul_catalog_entry"
sidebar_current: "docs-consul-resource-catalog-entry" sidebar_current: "docs-consul-resource-catalog-entry"
description: |- description: |-
Provides access to Catalog data in Consul. This can be used to define a node or a service. Currently, defining health checks is not supported. Registers a node or service with the Consul Catalog. Currently, defining health checks is not supported.
--- ---
# consul\_catalog\_entry # consul\_catalog\_entry
Provides access to Catalog data in Consul. This can be used to define a Registers a node or service with the [Consul Catalog](https://www.consul.io/docs/agent/http/catalog.html#catalog_register).
node or a service. Currently, defining health checks is not supported. Currently, defining health checks is not supported.
## Example Usage ## Example Usage
@ -41,6 +41,11 @@ The following arguments are supported:
* `service` - (Optional) A service to optionally associated with * `service` - (Optional) A service to optionally associated with
the node. Supported values are documented below. the node. Supported values are documented below.
* `datacenter` - (Optional) The datacenter to use. This overrides the
datacenter in the provider setup and the agent's default datacenter.
* `token` - (Optional) ACL token.
The `service` block supports the following: The `service` block supports the following:
* `address` - (Optional) The address of the service. Defaults to the * `address` - (Optional) The address of the service. Defaults to the

16
website/source/docs/providers/vault/index.html.markdown
View File

@ -129,13 +129,23 @@ The `client_auth` configuration block accepts the following arguments:
``` ```
provider "vault" { provider "vault" {
# It is strongly recommended to configure this provider through the # It is strongly recommended to configure this provider through the
# environment variables described below, so that each user can have # environment variables described above, so that each user can have
# separate credentials set in the environment. # separate credentials set in the environment.
address = "https://vault.example.net:8200" #
# This will default to using $VAULT_ADDR
# But can be set explicitly
# address = "https://vault.example.net:8200"
} }
data "vault_generic_secret" "example" { resource "vault_generic_secret" "example" {
path = "secret/foo" path = "secret/foo"
data_json = <<EOT
{
"foo": "bar",
"pizza": "cheese"
}
EOT
} }
``` ```