From b4ca04cb780f407eac90925aeedf93ea05c472f6 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 1 Jul 2015 13:11:21 -0500 Subject: [PATCH 01/27] docs: expand how to assign mappings from file --- .../intro/getting-started/variables.html.md | 51 +++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/website/source/intro/getting-started/variables.html.md b/website/source/intro/getting-started/variables.html.md index 935769f517..691c91f385 100644 --- a/website/source/intro/getting-started/variables.html.md +++ b/website/source/intro/getting-started/variables.html.md @@ -98,6 +98,7 @@ the `TF_VAR_access_key` variable can be set to set the `access_key` variable. We recommend using the "terraform.tfvars" file, and ignoring it from version control. + ## Mappings We've replaced our sensitive strings with variables, but we still @@ -140,15 +141,59 @@ While we don't use it in our example, it is worth noting that you can also do a static lookup of a mapping directly with `${var.amis.us-east-1}`. -We set defaults, but mappings can also be overridden using the -`-var` and `-var-file` values. For example, if the user wanted to -specify an alternate AMI for us-east-1: + +## Assigning Mappings + +We set defaults above, but mappings can also be set using the `-var` and +`-var-file` values. For example, if the user wanted to specify an alternate AMI +for us-east-1: ``` $ terraform plan -var 'amis.us-east-1=foo' ... ``` +**Note**: even if every key will be assigned as input, the variable must be +established as a mapping by setting its default to `{}`. + +Here is an example of setting a mapping's keys from a file. Starting with these +variable definitions: + +``` +variable "region" {} +variable "amis" { + default = {} +} +``` + +You can specify keys in a `terraform.tfvars` file: + +``` +amis.us-east-1 = "ami-abc123" +amis.us-west-2 = "ami-def456" +``` + +And access them via `lookup()`: + +``` +output "ami" { + value = "${lookup(var.amis, var.region)} +} +``` + +Like so: + +``` +$ terraform apply -var region=us-west-2 + +Apply complete! Resources: 0 added, 0 changed, 0 destroyed. + +Outputs: + + ami = ami-def456 + +``` + ## Next Terraform provides variables for parameterizing your configurations. From 382cad03c28a0c206f4dbb9bbaf23cdf655d6a43 Mon Sep 17 00:00:00 2001 From: Nathaniel Schweinberg Date: Wed, 1 Jul 2015 21:38:25 -0500 Subject: [PATCH 02/27] Added page documenting useful Environment Variables --- .../environment-variables.html.md | 64 +++++++++++++++++++ website/source/layouts/docs.erb | 4 ++ 2 files changed, 68 insertions(+) create mode 100644 website/source/docs/configuration/environment-variables.html.md diff --git a/website/source/docs/configuration/environment-variables.html.md b/website/source/docs/configuration/environment-variables.html.md new file mode 100644 index 0000000000..60b426b357 --- /dev/null +++ b/website/source/docs/configuration/environment-variables.html.md @@ -0,0 +1,64 @@ +--- +layout: "docs" +page_title: "Environment Variables" +sidebar_current: "docs-config-environment-variables" +description: |- + Something on Environment Variables! +--- + +# Environment Variables + +## TF_LOG + +If set to any value, enables detailed logs to appear on stderr which is useful for debugging. For example: + +``` +export TF_LOG=1 +``` + +To disable, either unset it or set it to empty. For example: + +``` +export TF_LOG= +``` + +For more on debugging Terraform, check out the section on [Debugging](/docs/internals/debugging.html). + +## TF_LOG_PATH + +This specifies where the log should persist its output to. Note that even when `TF_LOG_PATH` is set, `TF_LOG` must be set in order for any logging to be enabled. For example, to always write the log to the directory you're currently running terraform from: + +``` +export TF_LOG_PATH=./terraform.log +``` + +For more on debugging Terraform, check out the section on [Debugging](/docs/internals/debugging.html). + +## TF_INPUT + +If set to "false" or "0", causes terraform commands to behave as if the `-input=false` flag was specified. This is used when you want to disable prompts for variables that haven't had their values specified. For example: + +``` +export TF_INPUT=0 +``` + +## TF_MODULE_DEPTH + +When given a value, causes terraform commands to behave as if the `-module=depth=VALUE` flag was specified. Modules are treated like a black box and terraform commands do not show what resources within the module will be created. By setting this to -1, for example, you enable commands such as [plan](/docs/commands/plan.html) and [graph](/docs/commands/graph.html) to display more detailed information. + +``` +export TF_MODULE_DEPTH=-1 +``` + +For more information regarding modules, check out the section on [Using Modules](/docs/modules/usage.html). + +## TF_VAR_name + +Environment variables can be used to set variables. The environment variables must be in the format `TF_VAR_name` and this will be checked last for a value. For example: + +``` +export TF_VAR_region=us-west-1 +export TF_VAR_ami=ami-049d8641 +``` + +For more on how to use `TF_VAR_name` in context, check out the section on [Variable Configuration](/docs/configuration/variables.html). diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index dbbf87b8ad..ef69a86d16 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -49,6 +49,10 @@ Atlas + > + Environment Variables + + From 80d77df477456e4abe98dd8b2b1f683a879c0650 Mon Sep 17 00:00:00 2001 From: Nathaniel Schweinberg Date: Wed, 1 Jul 2015 21:40:04 -0500 Subject: [PATCH 03/27] fixed indentation --- website/source/layouts/docs.erb | 432 ++++++++++++++++---------------- 1 file changed, 216 insertions(+), 216 deletions(-) diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index ef69a86d16..da123e74e4 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -1,266 +1,266 @@ <% wrap_layout :inner do %> - <% content_for :sidebar do %> - + <% end %> - <%= yield %> - <% end %> + <%= yield %> + <% end %> From d857746d49a9a179b59810c9b1578b051148905d Mon Sep 17 00:00:00 2001 From: Nathaniel Schweinberg Date: Wed, 1 Jul 2015 21:46:51 -0500 Subject: [PATCH 04/27] tweaking indentation settings --- website/source/layouts/docs.erb | 406 ++++++++++++++++---------------- 1 file changed, 203 insertions(+), 203 deletions(-) diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index da123e74e4..3bcb156549 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -1,266 +1,266 @@ <% wrap_layout :inner do %> - <% content_for :sidebar do %> - + <% end %> - <%= yield %> - <% end %> + <%= yield %> + <% end %> From e38ced77854ad18c3e84d9d099699c5125241f94 Mon Sep 17 00:00:00 2001 From: Nathaniel Schweinberg Date: Wed, 1 Jul 2015 21:48:25 -0500 Subject: [PATCH 05/27] retabd --- website/source/layouts/docs.erb | 420 ++++++++++++++++---------------- 1 file changed, 210 insertions(+), 210 deletions(-) diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 3bcb156549..f965d2ab62 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -1,266 +1,266 @@ <% wrap_layout :inner do %> - <% content_for :sidebar do %> - + <% end %> - <%= yield %> - <% end %> + <%= yield %> + <% end %> From 03554ec8ca132e3978b0488d98e48954c62f6719 Mon Sep 17 00:00:00 2001 From: Nathaniel Schweinberg Date: Wed, 1 Jul 2015 21:50:26 -0500 Subject: [PATCH 06/27] fixed formatting glitches --- website/source/layouts/docs.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index f965d2ab62..6e650eb185 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -85,7 +85,7 @@ > plan - + > push @@ -93,7 +93,7 @@ > refresh - + > remote @@ -120,10 +120,10 @@ > Providers -
    +
      > Atlas - + > AWS @@ -135,11 +135,11 @@ > CloudFlare - + - > + > CloudStack - + > Consul From c29b4a9edd438c7e455d010187215f09d32d412b Mon Sep 17 00:00:00 2001 From: Nathaniel Schweinberg Date: Thu, 2 Jul 2015 13:49:57 -0500 Subject: [PATCH 07/27] adding more verbose description to Environment Variables page, explained TF_LOG more --- .../source/docs/configuration/environment-variables.html.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/configuration/environment-variables.html.md b/website/source/docs/configuration/environment-variables.html.md index 60b426b357..bcb8fc506c 100644 --- a/website/source/docs/configuration/environment-variables.html.md +++ b/website/source/docs/configuration/environment-variables.html.md @@ -3,7 +3,7 @@ layout: "docs" page_title: "Environment Variables" sidebar_current: "docs-config-environment-variables" description: |- - Something on Environment Variables! + Terraform uses different environment variables that can be used to configure various aspects of how Terraform behaves. this section documents those variables, their potential values, and how to use them. --- # Environment Variables @@ -16,7 +16,7 @@ If set to any value, enables detailed logs to appear on stderr which is useful f export TF_LOG=1 ``` -To disable, either unset it or set it to empty. For example: +To disable, either unset it or set it to empty. When unset, logging will default to stderr. For example: ``` export TF_LOG= From cf5926ddadf5bff0739d22cbd368cd9745130d37 Mon Sep 17 00:00:00 2001 From: Jason Gedge Date: Sun, 12 Jul 2015 15:55:19 -0400 Subject: [PATCH 08/27] Add a function to find the index of an element in a list. --- config/interpolate_funcs.go | 20 +++++++++++ config/interpolate_funcs_test.go | 33 +++++++++++++++++++ .../docs/configuration/interpolation.html.md | 3 ++ 3 files changed, 56 insertions(+) diff --git a/config/interpolate_funcs.go b/config/interpolate_funcs.go index 9b26c24ff2..bbe2b84349 100644 --- a/config/interpolate_funcs.go +++ b/config/interpolate_funcs.go @@ -24,6 +24,7 @@ func init() { "file": interpolationFuncFile(), "format": interpolationFuncFormat(), "formatlist": interpolationFuncFormatList(), + "index": interpolationFuncIndex(), "join": interpolationFuncJoin(), "length": interpolationFuncLength(), "replace": interpolationFuncReplace(), @@ -178,6 +179,25 @@ func interpolationFuncFormatList() ast.Function { } } +// interpolationFuncIndex implements the "index" function that allows one to +// find the index of a specific element in a list +func interpolationFuncIndex() ast.Function { + return ast.Function{ + ArgTypes: []ast.Type{ast.TypeString, ast.TypeString}, + ReturnType: ast.TypeInt, + Callback: func(args []interface{}) (interface{}, error) { + haystack := StringList(args[0].(string)).Slice() + needle := args[1].(string) + for index, element := range haystack { + if needle == element { + return index, nil + } + } + return nil, fmt.Errorf("Could not find '%s' in '%s'", needle, haystack) + }, + } +} + // interpolationFuncJoin implements the "join" function that allows // multi-variable values to be joined by some character. func interpolationFuncJoin() ast.Function { diff --git a/config/interpolate_funcs_test.go b/config/interpolate_funcs_test.go index 3258bda5c4..05f84c201d 100644 --- a/config/interpolate_funcs_test.go +++ b/config/interpolate_funcs_test.go @@ -206,6 +206,39 @@ func TestInterpolateFuncFormatList(t *testing.T) { }) } +func TestInterpolateFuncIndex(t *testing.T) { + testFunction(t, testFunctionConfig{ + Cases: []testFunctionCase{ + { + `${index("test", "")}`, + nil, + true, + }, + + { + fmt.Sprintf(`${index("%s", "foo")}`, + NewStringList([]string{"notfoo", "stillnotfoo", "bar"}).String()), + nil, + true, + }, + + { + fmt.Sprintf(`${index("%s", "foo")}`, + NewStringList([]string{"foo"}).String()), + "0", + false, + }, + + { + fmt.Sprintf(`${index("%s", "bar")}`, + NewStringList([]string{"foo", "spam", "bar", "eggs"}).String()), + "2", + false, + }, + }, + }) +} + func TestInterpolateFuncJoin(t *testing.T) { testFunction(t, testFunctionConfig{ Cases: []testFunctionCase{ diff --git a/website/source/docs/configuration/interpolation.html.md b/website/source/docs/configuration/interpolation.html.md index ce2796a9d1..3221299090 100644 --- a/website/source/docs/configuration/interpolation.html.md +++ b/website/source/docs/configuration/interpolation.html.md @@ -102,6 +102,9 @@ The supported built-in functions are: `formatlist("instance %v has private ip %v", aws_instance.foo.*.id, aws_instance.foo.*.private_ip)`. Passing lists with different lengths to formatlist results in an error. + * `index(list, elem)` - Finds the index of a given element in a list. Example: + `index(aws_instance.foo.*.tags.Name, "foo-test")` + * `join(delim, list)` - Joins the list with the delimiter. A list is only possible with splat variables from resources with a count greater than one. Example: `join(",", aws_instance.foo.*.id)` From 4bf24d5f973820f28086ed38fec241c43523bfb0 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Tue, 14 Jul 2015 13:40:58 -0400 Subject: [PATCH 09/27] Clarifying the resource state persistence mechanism for custom Provider/Resource authors --- website/source/docs/plugins/provider.html.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/website/source/docs/plugins/provider.html.md b/website/source/docs/plugins/provider.html.md index 5c3c720be3..780d347a07 100644 --- a/website/source/docs/plugins/provider.html.md +++ b/website/source/docs/plugins/provider.html.md @@ -142,7 +142,11 @@ The CRUD operations in more detail, along with their contracts: * `Create` - This is called to create a new instance of the resource. Terraform guarantees that an existing ID is not set on the resource - data. That is, you're working with a new resource. + data. That is, you're working with a new resource. Therefore, you are + responsible for calling `setId` on your `schema.ResourceData` using a + value suitable for your resource. This ensures whatever resource + state you set on `schema.ResourceData` will be persisted in local state. + If you neglect to `setId`, no resource state will be persisted. * `Read` - This is called to resync the local state with the remote state. Terraform guarantees that an existing ID will be set. This ID should be From d7e0e3fbe87289c74817b474b8008dedeac14d92 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Sun, 19 Jul 2015 14:15:56 -0400 Subject: [PATCH 10/27] Responding to feedback --- website/source/docs/plugins/provider.html.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/website/source/docs/plugins/provider.html.md b/website/source/docs/plugins/provider.html.md index 780d347a07..1ca41655b4 100644 --- a/website/source/docs/plugins/provider.html.md +++ b/website/source/docs/plugins/provider.html.md @@ -143,10 +143,10 @@ The CRUD operations in more detail, along with their contracts: * `Create` - This is called to create a new instance of the resource. Terraform guarantees that an existing ID is not set on the resource data. That is, you're working with a new resource. Therefore, you are - responsible for calling `setId` on your `schema.ResourceData` using a + responsible for calling `SetId` on your `schema.ResourceData` using a value suitable for your resource. This ensures whatever resource state you set on `schema.ResourceData` will be persisted in local state. - If you neglect to `setId`, no resource state will be persisted. + If you neglect to `SetId`, no resource state will be persisted. * `Read` - This is called to resync the local state with the remote state. Terraform guarantees that an existing ID will be set. This ID should be @@ -164,7 +164,8 @@ The CRUD operations in more detail, along with their contracts: * `Exists` - This is called to verify a resource still exists. It is called prior to `Read`, and lowers the burden of `Read` to be able - to assume the resource exists. + to assume the resource exists. If the resource is no longer present in + remote state, calling `SetId` with an empty string will signal its removal. ## Schemas From 9a7e6618cb18393b1dfc80af1e965da4b0f39d9d Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Tue, 28 Jul 2015 00:33:43 +0200 Subject: [PATCH 11/27] provider/openstack: not only SATA or SSD are valid volume types The available volume types depend on the used OpenStack environment. Closes-bug: #2864 --- .../providers/openstack/r/blockstorage_volume_v1.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/openstack/r/blockstorage_volume_v1.html.markdown b/website/source/docs/providers/openstack/r/blockstorage_volume_v1.html.markdown index 46dd7a5e21..70ab709a07 100644 --- a/website/source/docs/providers/openstack/r/blockstorage_volume_v1.html.markdown +++ b/website/source/docs/providers/openstack/r/blockstorage_volume_v1.html.markdown @@ -53,7 +53,7 @@ The following arguments are supported: * `metadata` - (Optional) Metadata key/value pairs to associate with the volume. Changing this updates the existing volume metadata. -* `volume_type` - (Optional) The type of volume to create (either SATA or SSD). +* `volume_type` - (Optional) The type of volume to create. Changing this creates a new volume. ## Attributes Reference From 85d1d15d81deb7a486418773994bc6fe4710d33a Mon Sep 17 00:00:00 2001 From: Eric Connell Date: Thu, 25 Jun 2015 16:20:12 -0700 Subject: [PATCH 12/27] output command supports printing all outputs if no output name is specified all outputs are displayed fixed formating and added missing help for -module parameter --- command/output.go | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/command/output.go b/command/output.go index 63a6926f3c..f0fb096dc7 100644 --- a/command/output.go +++ b/command/output.go @@ -3,6 +3,7 @@ package command import ( "flag" "fmt" + "sort" "strings" ) @@ -26,14 +27,18 @@ func (c *OutputCommand) Run(args []string) int { } args = cmdFlags.Args() - if len(args) != 1 || args[0] == "" { + if len(args) > 1 { c.Ui.Error( "The output command expects exactly one argument with the name\n" + - "of an output variable.\n") + "of an output variable or no arguments to show all outputs.\n") cmdFlags.Usage() return 1 } - name := args[0] + + name := "" + if len(args) > 0 { + name = args[0] + } stateStore, err := c.Meta.State() if err != nil { @@ -68,6 +73,20 @@ func (c *OutputCommand) Run(args []string) int { return 1 } + if name == "" { + ks := make([]string, 0, len(mod.Outputs)) + for k, _ := range mod.Outputs { + ks = append(ks, k) + } + sort.Strings(ks) + + for _, k := range ks { + v := mod.Outputs[k] + c.Ui.Output(fmt.Sprintf("%s = %s", k, v)) + } + return 0 + } + v, ok := mod.Outputs[name] if !ok { c.Ui.Error(fmt.Sprintf( @@ -84,17 +103,20 @@ func (c *OutputCommand) Run(args []string) int { func (c *OutputCommand) Help() string { helpText := ` -Usage: terraform output [options] NAME +Usage: terraform output [options] [NAME] Reads an output variable from a Terraform state file and prints - the value. + the value. If NAME is not specified, all outputs are printed. Options: -state=path Path to the state file to read. Defaults to - "terraform.tfstate". + "terraform.tfstate". - -no-color If specified, output won't contain any color. + -no-color If specified, output won't contain any color. + + -module=name If specified, returns the outputs for a + specific module ` return strings.TrimSpace(helpText) From 382c0ba23d66824304b134a2862eb01c52c5d26e Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Mon, 3 Aug 2015 12:44:41 +0100 Subject: [PATCH 13/27] command/output: Update test since we now allow printing everything --- command/output_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/command/output_test.go b/command/output_test.go index f84642269c..e8d4690298 100644 --- a/command/output_test.go +++ b/command/output_test.go @@ -161,7 +161,8 @@ func TestOutput_blank(t *testing.T) { &terraform.ModuleState{ Path: []string{"root"}, Outputs: map[string]string{ - "foo": "bar", + "foo": "bar", + "name": "john-doe", }, }, }, @@ -181,9 +182,16 @@ func TestOutput_blank(t *testing.T) { "-state", statePath, "", } - if code := c.Run(args); code != 1 { + + if code := c.Run(args); code != 0 { t.Fatalf("bad: \n%s", ui.ErrorWriter.String()) } + + expectedOutput := "foo = bar\nname = john-doe\n" + output := ui.OutputWriter.String() + if output != expectedOutput { + t.Fatalf("Expected output: %#v\ngiven: %#v", expectedOutput, output) + } } func TestOutput_manyArgs(t *testing.T) { From 30d57bf1ecbc4f5f0db3395835ef5933db1de7d6 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Tue, 4 Aug 2015 11:09:43 -0700 Subject: [PATCH 14/27] Clarify math operations available for interpolation As reported in #2782, the math operations, specifically subtraction, can cause unexpected behavior when resource or variable names use hyphens. I added clarification about using spaces with math operators as well as which operations are available. --- .../docs/configuration/interpolation.html.md | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/website/source/docs/configuration/interpolation.html.md b/website/source/docs/configuration/interpolation.html.md index 74b946cf16..0d15cc9dd6 100644 --- a/website/source/docs/configuration/interpolation.html.md +++ b/website/source/docs/configuration/interpolation.html.md @@ -17,7 +17,7 @@ The interpolation syntax is powerful and allows you to reference variables, attributes of resources, call functions, etc. You can also perform simple math in interpolations, allowing -you to write expressions such as `${count.index+1}`. +you to write expressions such as `${count.index + 1}`. You can escape interpolation with double dollar signs: `$${foo}` will be rendered as a literal `${foo}`. @@ -92,7 +92,7 @@ The supported built-in functions are: format. The syntax for the format is standard `sprintf` syntax. Good documentation for the syntax can be [found here](http://golang.org/pkg/fmt/). Example to zero-prefix a count, used commonly for naming servers: - `format("web-%03d", count.index+1)`. + `format("web-%03d", count.index + 1)`. * `formatlist(format, args...)` - Formats each element of a list according to the given format, similarly to `format`, and returns a list. @@ -201,3 +201,34 @@ resource "aws_instance" "web" { With this, we will build a list of `template_file.web_init` resources which we can use in combination with our list of `aws_instance.web` resources. + +## Math + +Simple math can be performed in interpolations: + +``` +variable "count" { + default = 2 +} + +resource "aws_instance" "web" { + // ... + count = "${var.count}" + + // tag the instance with a counter starting at 1, ie. web-001 + tags { + Name = "${format("web-%03d", count.index + 1)}" + } +} +``` + +The supported operations are: + +- *Add*, *Subtract*, *Multiply*, and *Divide* for **float** types +- *Add*, *Subtract*, *Multiply*, *Divide*, and *Modulo* for **integer** types + +-> **Note:** Since Terraform allows hyphens in resource and variable names, +it's best to use spaces between math operators to prevent confusion or unexpected +behavior. For example, `${var.instance-count - 1}` will subtract **1** from the +`instance-count` variable value, while `${var.instance-count-1}` will interpolate +the `instance-count-1` variable value. From ca252ccee98eb3a670d31433394d0242ffc9bed0 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Tue, 4 Aug 2015 11:12:24 -0700 Subject: [PATCH 15/27] Changed math example to use spaces between math operator --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3fc3d822d..ae87a5a3a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ IMPROVEMENTS: * provider/aws: Allow configuration of the DynamoDB Endpoint [GH-2825] * provider/aws: Compute private ip addresses of ENIs if they are not specified [GH-2743] * provider/azure: Allow `settings_file` to accept XML string [GH-2922] - * provider/azure: Provide a simpler error when using a Platform Image without a + * provider/azure: Provide a simpler error when using a Platform Image without a Storage Service [GH-2861] * provider/google: `account_file` is now expected to be JSON. Paths are still supported for backwards compatibility. [GH-2839] @@ -557,7 +557,7 @@ FEATURES: less likely to become corrupt in a catastrophic case: terraform panic or system killing Terraform. * **Math operations** in interpolations. You can now do things like - `${count.index+1}`. [GH-1068] + `${count.index + 1}`. [GH-1068] * **New AWS SDK:** Move to `aws-sdk-go` (hashicorp/aws-sdk-go), a fork of the official `awslabs` repo. We forked for stability while `awslabs` refactored the library, and will move back to the officially From 38ef406b87916dbab6ae2c90cf737f7f840ee49a Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Sat, 8 Aug 2015 14:13:09 +0100 Subject: [PATCH 16/27] Updating Launch Config Docs for Name attribute Hopefully this will help clear up this type of confusion https://github.com/hashicorp/terraform/issues/2958 --- .../docs/providers/aws/r/launch_configuration.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/source/docs/providers/aws/r/launch_configuration.html.markdown b/website/source/docs/providers/aws/r/launch_configuration.html.markdown index ccd77235a5..8b8507d524 100644 --- a/website/source/docs/providers/aws/r/launch_configuration.html.markdown +++ b/website/source/docs/providers/aws/r/launch_configuration.html.markdown @@ -10,6 +10,8 @@ description: |- Provides a resource to create a new launch configuration, used for autoscaling groups. +~> **NOTE:** You may want to omit `name` attribute from attached `aws_launch_configuration`. When you [create](http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/LaunchConfiguration.html) a launch configuration, you cannot edit it. Terraform will treat a change in this resource as a destroy and create action. If you add a name to your launch configuration, then terraform will not be able to create the replacement launch configuration due to the name being the same. + ## Example Usage ``` From f8d4a440cb909cf9919222fface26e60441ee24f Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Sun, 2 Aug 2015 16:37:52 +0100 Subject: [PATCH 17/27] google: Add example of two-tier app --- examples/google-two-tier/.gitignore | 1 + examples/google-two-tier/README.md | 39 ++++++++++ examples/google-two-tier/main.tf | 77 +++++++++++++++++++ examples/google-two-tier/output.tf | 7 ++ .../google-two-tier/terraform.tfvars.example | 6 ++ examples/google-two-tier/variables.tf | 15 ++++ 6 files changed, 145 insertions(+) create mode 100644 examples/google-two-tier/.gitignore create mode 100644 examples/google-two-tier/README.md create mode 100644 examples/google-two-tier/main.tf create mode 100644 examples/google-two-tier/output.tf create mode 100644 examples/google-two-tier/terraform.tfvars.example create mode 100644 examples/google-two-tier/variables.tf diff --git a/examples/google-two-tier/.gitignore b/examples/google-two-tier/.gitignore new file mode 100644 index 0000000000..3f5ca68adc --- /dev/null +++ b/examples/google-two-tier/.gitignore @@ -0,0 +1 @@ +terraform.tfvars diff --git a/examples/google-two-tier/README.md b/examples/google-two-tier/README.md new file mode 100644 index 0000000000..d29cf608ec --- /dev/null +++ b/examples/google-two-tier/README.md @@ -0,0 +1,39 @@ +# Basic Two-Tier Architecture in Google Cloud + +This provides a template for running a simple two-tier architecture on Google Cloud. +The premise is that you have stateless app servers running behind +a load balancer serving traffic. + +To simplify the example, this intentionally ignores deploying and +getting your application onto the servers. However, you could do so either via +[startup script](http://terraform.io/docs/providers/google/r/compute_instance.html#metadata_startup_script) or +[provisioners](https://www.terraform.io/docs/provisioners/) and a configuration +management tool, or by pre-baking configured images with +[Packer](https://packer.io/docs/builders/googlecompute.html). + +After you run `terraform apply` on this configuration, it will +automatically output the public IP address of the load balancer. +After your instance registers, the LB should respond with a simple header: + +```html +

      Welcome to instance 0

      +``` + +The index may differ once you increase `count` of `google_compute_instance` +(i.e. provision more instances). + +To run, configure your Google Cloud provider as described in + +https://www.terraform.io/docs/providers/google/index.html + +Run with a command like this: + +``` +terraform apply \ + -var="region=us-central1" \ + -var="region_zone=us-central1-f" \ + -var="project_name=my-project-id-123" \ + -var="account_file_path=~/.gcloud/Terraform.json" \ + -var="public_key_path=~/.ssh/gcloud_id_rsa.pub" \ + -var="private_key_path=~/.ssh/gcloud_id_rsa" +``` diff --git a/examples/google-two-tier/main.tf b/examples/google-two-tier/main.tf new file mode 100644 index 0000000000..bf0409e386 --- /dev/null +++ b/examples/google-two-tier/main.tf @@ -0,0 +1,77 @@ +# See https://cloud.google.com/compute/docs/load-balancing/network/example + +provider "google" { + region = "${var.region}" + project = "${var.project_name}" + account_file = "${file(var.account_file_path)}" +} + +resource "google_compute_http_health_check" "default" { + name = "tf-www-basic-check" + request_path = "/" + check_interval_sec = 1 + healthy_threshold = 1 + unhealthy_threshold = 10 + timeout_sec = 1 +} + +resource "google_compute_target_pool" "default" { + name = "tf-www-target-pool" + instances = ["${google_compute_instance.www.*.self_link}"] + health_checks = ["${google_compute_http_health_check.default.name}"] +} + +resource "google_compute_forwarding_rule" "default" { + name = "tf-www-forwarding-rule" + target = "${google_compute_target_pool.default.self_link}" + port_range = "80" +} + +resource "google_compute_instance" "www" { + count = 3 + + name = "tf-www-${count.index}" + machine_type = "n1-standard-1" + zone = "${var.region_zone}" + tags = ["www-node"] + + disk { + image = "ubuntu-os-cloud/ubuntu-1204-precise-v20150625" + } + + network_interface { + network = "default" + access_config { + # Ephemeral + } + } + + metadata { + sshKeys = "ubuntu:${file("~/.ssh/gcloud_id_rsa.pub")}" + startup-script = <