From e2373c8073a6a5481c568fa60c59ab7870b2bc37 Mon Sep 17 00:00:00 2001 From: Thomas Kula Date: Fri, 22 Jun 2018 13:18:27 -0400 Subject: [PATCH] website: Using demo.consul.io requires scheme = "https" Following the examples as they were previously would cause errors accessing demo.consul.io. Now we consistently set the scheme to https for all examples that use demo.consul.io. This also includes some other updates to the URLs, since the Consul demo has been rebuilt with a different based configuration, and some general formatting and copyediting changes in the Consul example. --- website/docs/backends/config.html.md | 5 +++- website/docs/backends/types/consul.html.md | 1 + website/intro/examples/consul.html.markdown | 25 +++++++++---------- .../getting-started/remote.html.markdown | 1 + website/upgrade-guides/0-9.html.markdown | 1 + 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/website/docs/backends/config.html.md b/website/docs/backends/config.html.md index bc24a5eb5..f7f7c70be 100644 --- a/website/docs/backends/config.html.md +++ b/website/docs/backends/config.html.md @@ -18,6 +18,7 @@ Below, we show a complete example configuring the "consul" backend: terraform { backend "consul" { address = "demo.consul.io" + scheme = "https" path = "example_app/terraform_state" } } @@ -102,6 +103,7 @@ or `backend` block: ```hcl address = "demo.consul.io" path = "example_app/terraform_state" +scheme = "https" ``` The same settings can alternatively be specified on the command line as @@ -110,7 +112,8 @@ follows: ``` $ terraform init \ -backend-config="address=demo.consul.io" \ - -backend-config="path=example_app/terraform_state" + -backend-config="path=example_app/terraform_state" \ + -backend-config="scheme=https" ``` ## Changing Configuration diff --git a/website/docs/backends/types/consul.html.md b/website/docs/backends/types/consul.html.md index 0c35e0766..79d726fb9 100644 --- a/website/docs/backends/types/consul.html.md +++ b/website/docs/backends/types/consul.html.md @@ -20,6 +20,7 @@ This backend supports [state locking](/docs/state/locking.html). terraform { backend "consul" { address = "demo.consul.io" + scheme = "https" path = "full/path" } } diff --git a/website/intro/examples/consul.html.markdown b/website/intro/examples/consul.html.markdown index 23602b775..ecd3df359 100644 --- a/website/intro/examples/consul.html.markdown +++ b/website/intro/examples/consul.html.markdown @@ -18,32 +18,31 @@ to process requests. Terraform provides a [Consul provider](/docs/providers/consul/index.html) which can be used to interface with Consul from inside a Terraform configuration. -For our example, we use the [Consul demo cluster](http://demo.consul.io) +For our example, we use the [Consul demo cluster](https://demo.consul.io/) to both read configuration and store information about a newly created EC2 instance. -The size of the EC2 instance will be determined by the `tf\_test/size` key in Consul, +The size of the EC2 instance will be determined by the `tf_test/size` key in Consul, and will default to `m1.small` if that key does not exist. Once the instance is created -the `tf\_test/id` and `tf\_test/public\_dns` keys will be set with the computed +the `tf_test/id` and `tf_test/public_dns` keys will be set with the computed values for the instance. -Before we run the example, use the [Web UI](http://demo.consul.io/ui/#/nyc3/kv/) -to set the `tf\_test/size` key to `t1.micro`. Once that is done, +Before we run the example, use the [Web UI](https://demo.consul.io/ui/dc1/kv/) +to set the `tf_test/size` key to `t1.micro`. Once that is done, copy the configuration into a configuration file (`consul.tf` works fine). Either provide the AWS credentials as a default value in the configuration or invoke `apply` with the appropriate variables set. Once the `apply` has completed, we can see the keys in Consul by -visiting the [Web UI](http://demo.consul.io/ui/#/nyc3/kv/). We can see -that the "tf\_test/id" and "tf\_test/public\_dns" values have been +visiting the [Web UI](https://demo.consul.io/ui/dc1/kv/). We can see +that the `tf_test/id` and `tf_test/public_dns` values have been set. -We can now teardown the infrastructure following the -[instructions here](/intro/getting-started/destroy.html). Because -we set the `delete` property of two of the Consul keys, Terraform -will cleanup those keys on destroy. We can verify this by using +You can now [tear down the infrastructure](/intro/getting-started/destroy.html) +Because we set the `delete` property of two of the Consul keys, Terraform +will clean up those keys on destroy. We can verify this by using the Web UI. -The point of this example is to show that Consul can be used with -Terraform both to enable dynamic inputs, but to also store outputs. +This example has shown that Consul can be used with Terraform both to read +existing values and to store generated results. Inputs like AMI name, security groups, Puppet roles, bootstrap scripts, etc can all be loaded from Consul. This allows the specifics of an diff --git a/website/intro/getting-started/remote.html.markdown b/website/intro/getting-started/remote.html.markdown index ea3cfe0c0..ef401fcb4 100644 --- a/website/intro/getting-started/remote.html.markdown +++ b/website/intro/getting-started/remote.html.markdown @@ -55,6 +55,7 @@ terraform { address = "demo.consul.io" path = "getting-started-RANDOMSTRING" lock = false + scheme = "https" } } ``` diff --git a/website/upgrade-guides/0-9.html.markdown b/website/upgrade-guides/0-9.html.markdown index 6da0d83c0..4145ec026 100644 --- a/website/upgrade-guides/0-9.html.markdown +++ b/website/upgrade-guides/0-9.html.markdown @@ -41,6 +41,7 @@ terraform { address = "demo.consul.io" datacenter = "nyc3" path = "tfdemo" + scheme = "https" } } ```