Commit Graph

933 Commits

Author SHA1 Message Date
Stephen Chu f5102e9174 Added docs for route53 zone 'comment' argument. 2015-05-21 20:05:52 +00:00
Clint Shryock 6de8f9d180 provider/aws: RDS Read Replica cleanups
remove typos, debugging, and try spelling things correctly
2015-05-21 09:49:46 -05:00
Julien Lavergne d56eb3eb92 added attributes reference section for AWS_EBS_VOLUME 2015-05-21 12:06:13 +02:00
Julien Lavergne fb847151b5 fixed aws_ebs_volume description 2015-05-21 11:54:11 +02:00
Michael Austin dba8771b14 added documention for force_destroy argument 2015-05-20 19:26:44 -04:00
Clint Shryock d755fbd347 provider/aws: Add docs for AWS RDS Read Replicate 2015-05-20 08:24:36 -05:00
Justin Campbell c585aae38b Merge pull request #1992 from justincampbell/s3-policy
providers/aws: Add support for policy on S3 bucket
2015-05-18 13:34:58 -04:00
Justin Campbell 9c764a3253 providers/aws: Add support for policy on S3 bucket 2015-05-18 13:10:44 -04:00
Sander van Harmelen aa4aca65d0 Merge pull request #2003 from svanharmelen/f-update-docs
provisioner/chef: small fix in the docs
2015-05-18 16:29:21 +02:00
Sander van Harmelen 0e87980c72 provisioner/chef: small fix in the docs 2015-05-18 16:21:31 +02:00
John Engelman 597ecf82e4 Remove notes about nameservers only being available for public zones.
Support for nameservers in private zones was added in bd6ff34.
2015-05-15 21:24:11 -05:00
Clint 9f52192a79 Merge pull request #1939 from johnewart/sqs
Initial SQS support
2015-05-15 15:44:52 -05:00
John Ewart d538194f59 Added docs, tests, and updated SQS code 2015-05-15 13:09:20 -07:00
Paul Hinze e1ea427649 provider/aws: support ec2 termination protection
closes #1233
2015-05-15 15:20:58 -04:00
Clint Shryock 5113761f41 Merge branch 'f-aws-network-subnet-ids'
* f-aws-network-subnet-ids:
  document Network ACL Subnet IDs attribute
  provider/aws: Add tests for Network ACL subnets
  upgrade to use typeset for subnet_ids
  network acl cleanups
  provider/aws: Support multiple subnets in Network ACL
2015-05-15 09:58:57 -05:00
Clint Shryock bf65f7c013 document Network ACL Subnet IDs attribute 2015-05-15 09:35:38 -05:00
Justin Campbell e68dd5a8bf Merge pull request #1909 from justincampbell/s3-redirect
providers/aws: Add support for S3 website redirect
2015-05-15 09:32:39 -04:00
John Engelman 43607523fa Add missing sidebar item for zone_association. 2015-05-14 16:04:37 -05:00
John Engelman f1d85f955a Fix typo in docs 2015-05-14 16:04:37 -05:00
John Engelman b784908491 Add documentation and changelog for route53_zone_association 2015-05-14 16:04:36 -05:00
John Engelman 258422621f Update documentation and changelog for route53_hosted_zone. 2015-05-14 16:03:51 -05:00
John Engelman bf97d6a80f AWS/Route53Zone - create private hosted zone associated with VPC. 2015-05-14 16:03:50 -05:00
Paul Hinze b56a42627f provider/aws: ASGs can wait for ELB InService
This enhances the waiting strategy introduced in #1839 to wait for each
ASG instance to become InService in attached ELBs before continuing.
2015-05-14 15:03:53 -05:00
Mitchell Hashimoto ad62be8642 website: parameter_group_name for elasticache cluster required [GH-1929] 2015-05-13 20:23:37 -07:00
Mitchell Hashimoto 0c9e95a32f website: note that interpolations can be escaped 2015-05-13 20:22:14 -07:00
Daisuke Fujita 89c97787df Fix argument mistake in IAM group policy document 2015-05-14 10:34:02 +09:00
Paul Hinze f0e6d0f97e docs: fix cidr_block on aws SG egress
fixes #1936
2015-05-13 18:41:41 -05:00
uzyexe 2043698819 missing is "aws_" 2015-05-13 17:17:33 +09:00
Josh Bleecher Snyder 02e751e356 config: add formatlist
formatlist distributes formatting over lists.
See the docs for details.

As a colleague commented:

"It happens all the time that we want a set of
outputs, but in a slightly different way than
just simple joining or concatting."

formatlist (combined with join)
makes it easy to satisfy those needs.
2015-05-12 16:11:42 -07:00
Radek Simko 0c07fa359b Add missing EOF to iam_role_policy example 2015-05-12 22:29:36 +01:00
Radek Simko b5f0dc867b Fix incorrect parameter name 2015-05-12 22:29:36 +01:00
Radek Simko c214130401 aws: Reorder resources in IAM examples in docs
- This is to make relevant resources more visible
2015-05-12 22:29:36 +01:00
Radek Simko f24e8c7b53 Add docs for aws_iam_role 2015-05-12 22:29:35 +01:00
Sander van Harmelen 4e0aa334fa Merge pull request #1868 from svanharmelen/f-chef-client-provisioner
New provisioner for Chef-Client
2015-05-12 23:06:09 +02:00
Dave Cunningham 372908cc6f Merge pull request #980 from BashtonLtd/gce_instance_template_network_update
Update Instance Template network definition to match changes to Instance.
2015-05-12 15:46:04 -04:00
uzyexe b16b5e4a8c Typo in website docs for aws_route_table 2015-05-13 01:13:02 +09:00
Justin Campbell b8cd6b2bae providers/aws: Add support for S3 website redirect 2015-05-12 11:24:08 -04:00
Sander van Harmelen 11314a3d71 Tweaking a few minor things according to the feedback on GH 2015-05-12 10:37:38 +02:00
Dave Cunningham 5f15a9d26a Allow local SSDs, Fix #1088 2015-05-11 21:40:37 -04:00
Paul Hinze a268cc3d81 Merge pull request #1878 from jamesob/doc_for_paramterized_lists
Document work-arounds necessary to parameterize list types.
2015-05-08 17:02:36 -05:00
James O'Beirne 56ec897a84 Fix typo. 2015-05-08 14:58:01 -07:00
James O'Beirne a074b33bcf Document work-arounds necessary to parameterize list types.
Related to https://github.com/hashicorp/terraform/issues/57.
2015-05-08 14:49:29 -07:00
Sander van Harmelen c19d92fb67 Refactored quite a few things after review...
Also renamed the provisioner to just `chef` as it’s out intention to
end up with one provisioner for all types of `chef` clients.
2015-05-08 23:25:24 +02:00
Clint Shryock eaf96d9d6f provider/aws: Document AWS ElastiCache cluster
- ElastiCache subnet group name is computed
2015-05-08 14:33:41 -05:00
Radek Simko ce8351ddef provider/aws: Add FQDN as output to route53_record 2015-05-08 20:19:40 +01:00
Justin Campbell 870b48b1c0 Merge pull request #1865 from justincampbell/s3-region-zone
providers/aws: Add hosted_zone_id and region to attributes
2015-05-08 14:49:12 -04:00
Alexander Dupuy fa8cb0f495 link new openstack resource docs into sidebar 2015-05-08 18:14:02 +02:00
Justin Campbell 64d2b495c3 providers/aws: Add region to S3 attrs 2015-05-08 10:02:16 -04:00
Justin Campbell 839688d477 providers/aws: Add hosted_zone_id to S3 attrs 2015-05-08 10:02:16 -04:00
Sander van Harmelen 60984b2da2 This commit adds a Chef Client provisioner
The commit is pretty complete and has a tested/working provisioner for
both SSH and WinRM. There are a few tests, but we maybe need another
few to have better coverage. Docs are also included…
2015-05-08 14:54:56 +02:00
Radek Simko be2ab3a644 Duplicate of vpn-gateway link removed 2015-05-08 10:40:56 +01:00
Radek Simko c6a9a0684a Incorrect references fixed 2015-05-08 10:40:56 +01:00
Radek Simko ff1e4427cd Typo fixed (vpc -> vpn) 2015-05-08 10:40:56 +01:00
Radek Simko dfae8e1170 Do matching in sidebar_current via regex or equal sign 2015-05-08 10:40:51 +01:00
Mitchell Hashimoto f1ae920aa9 website: document templating as a provider 2015-05-07 18:20:22 -07:00
Clint Shryock 70984526a4 Merge remote-tracking branch 'ctiwald/ct/fix-protocol-problem'
* ctiwald/ct/fix-protocol-problem:
  aws: Document the odd protocol = "-1" behavior in security groups.
  aws: Fixup structure_test to handle new expandIPPerms behavior.
  aws: Add security group acceptance tests for protocol -1 fixes.
  aws: error on expndIPPerms(...) if our ports and protocol conflict.
2015-05-07 17:13:21 -05:00
Christopher Tiwald 0688431715 aws: Document network ACL's new validations. 2015-05-07 00:02:48 -04:00
Paul Hinze 90907c8be5 Merge pull request #1738 from justincampbell/s3-website
providers/aws: S3 bucket website support
2015-05-06 19:37:29 -05:00
Paul Hinze 9a286402c3 Merge pull request #1838 from josharian/consul-scheme
providers/consul: add scheme argument
2015-05-06 19:09:11 -05:00
Paul Hinze 761523e8f9 Merge pull request #1839 from hashicorp/f-aws-asg-wait-for-capacity
provider/aws: wait for ASG capacity on creation
2015-05-06 18:40:13 -05:00
Paul Hinze 063454e9b8 provider/aws: wait for ASG capacity on creation
On ASG creation, waits for up to 10m for desired_capacity or min_size
healthy nodes to show up in the group before continuing.

With CBD and proper HealthCheck tuning, this allows us guarantee safe
ASG replacement.
2015-05-06 18:34:20 -05:00
Josh Bleecher Snyder 30d34908b7 providers/consul: add scheme argument
This enables connecting to consul over https
without having to set the envvar CONSUL_HTTP_SSL.
2015-05-06 16:12:32 -07:00
Andrew Langhorn bb4f7415ca Rename "The The" so that they can play songs again
Other than the fact that "The the" doesn't really make any sense anywhere
that it's used in Terraform, they're a post-punk band from the UK.

Fixes "The The" so that they can get back to playing songs.
2015-05-06 22:53:11 +01:00
Josh Bleecher Snyder fa2e89a381 website: update aws security description docs 2015-05-06 10:08:30 -07:00
Justin Campbell 564b7e1e67 providers/aws: Add docs for S3 website 2015-05-06 08:15:56 -04:00
Paul Hinze 5d50264c31 core: module targeting
Adds the ability to target resources within modules, like:

module.mymod.aws_instance.foo

And the ability to target all resources inside a module, like:

module.mymod

Closes #1434
2015-05-05 21:58:48 -05:00
Paul Hinze cebcee5c63 Merge pull request #1778 from josharian/template-provider
providers: add template provider
2015-05-05 20:09:27 -05:00
Mitchell Hashimoto 56e92f7f02 website: document state 2015-05-05 17:52:28 -07:00
Clint Shryock 885efa0837 provider/aws: Add Security Group Rule as a top level resource
- document conflict with sg rules and sg in-line rules
- for this to work, ingress rules need to be computed
2015-05-05 16:56:39 -05:00
Clint a4000941c2 Merge pull request #1765 from hashicorp/f-aws-security-group-remove-default-egress
provider/aws: Remove default egress rule from Security Group on creation
2015-05-05 16:47:23 -05:00
Mitchell Hashimoto febc8643af website: add prpogating_vgws 2015-05-05 14:44:07 -07:00
Clint Shryock e9b08cf31f revert the required part 2015-05-05 16:23:26 -05:00
Clint Shryock b145ce88b7 Document Egress+VPC change, update link 2015-05-05 16:23:26 -05:00
Mitchell Hashimoto 412a2dca0b Merge pull request #1575 from freshbooks/aws-eni-route
provider/aws: Add Elastic Network Interfaces as route destination
2015-05-05 13:28:48 -07:00
Mitchell Hashimoto 379895931d website: network interface for EIP 2015-05-05 13:25:45 -07:00
Clint 18b43b78cb Merge pull request #939 from bitglue/iam
Implement a subset of IAM resources
2015-05-05 15:05:05 -05:00
Mitchell Hashimoto 639f310ae6 Merge pull request #1805 from dupuy/openstack-resource-docs
Openstack resource docs
2015-05-05 10:25:30 -07:00
Christopher Tiwald d76719bbb8 Add docs for various iam_* resources. 2015-05-05 12:47:20 -04:00
Phil Frost b082117e92 Implement AWS IAM resources
- Users
- Groups
- Roles
- Inline policies for the above three
- Instance profiles
- Managed policies
- Access keys

This is most of the data types provided by IAM. There are a few things
missing, but the functionality here is probably sufficient for 95% of
the cases. Makes a dent in #28.
2015-05-05 12:47:20 -04:00
jba 11ba9b1042 add the auto_accecpt option 2015-05-05 10:37:13 -05:00
Alexander Dupuy fdd1f566b9 missed docs changes from PR#1550 2015-05-05 14:53:19 +02:00
Alexander Dupuy b4df3c427a fix openstack fw/floating ip sidebar refs
expand firewall examples to be self-contained
2015-05-05 14:26:45 +02:00
Alexander Dupuy 2633585531 add online docs for remaining OpenStack resources 2015-05-05 14:00:51 +02:00
Avi Nanhkoesingh 1411d4010f Fixes #1: sets the rights values based on isUUID 2015-05-05 12:31:21 +02:00
Christopher Tiwald 2526379cf0 aws: Document the odd protocol = "-1" behavior in security groups. 2015-05-05 00:04:21 -04:00
Mitchell Hashimoto 9ed909c8fe Merge pull request #1749 from nabeken/aws-proxy-protocol-policy
provider/aws: Add proxy protocol support in ELB
2015-05-04 14:04:53 -07:00
Mitchell Hashimoto 8633c88723 Merge pull request #1775 from TimeIncOSS/r53-alias-record
aws: Add support for Alias records into AWS Route 53
2015-05-04 14:03:29 -07:00
Mitchell Hashimoto c8c0b02790 Merge pull request #1787 from koendc/f-aws-max-retries
aws: make MaxRetries for API calls configurable
2015-05-04 14:00:37 -07:00
Mitchell Hashimoto 2c90d3a637 Merge pull request #1793 from ctiwald/ct/add-vpn-connection-route
provider/aws: add support for VPN connection routes
2015-05-04 13:58:17 -07:00
Josh Bleecher Snyder 2da7c9a823 website: document templates
While we're here, fix a broken link.
2015-05-04 11:42:05 -07:00
Clint c437886a46 Merge pull request #1774 from hashicorp/b-website-parsing
Fix indentation, which was causing a rendering error in middleman
2015-05-04 12:05:54 -05:00
Christopher Tiwald e8976dca6b aws: Add documentation for VPN connection routes. 2015-05-04 12:55:55 -04:00
Christopher Tiwald 4727260987 aws: fix VPN connection acceptance test.
This corrects syntactical errors and uses distinct IP addresses for
each configuration.
2015-05-04 11:34:35 -04:00
Koen De Causmaecker 398c22adcd aws: make MaxRetries for API calls configurable
- Make it configurable in the AWS provider by add an option
  'max_retries'.
- Set the default from 3 to 11 retries.
2015-05-03 15:35:51 +02:00
Paul Hinze df15757311 docs: fix newline 2015-05-01 19:39:42 -05:00
Paul Hinze 199dabaf75 Merge pull request #1772 from ctiwald/ct/add-vpn-connection
Add support for AWS VPN connections.
2015-05-01 19:39:10 -05:00
TANABE Ken-ichi 3b549a9e4f Fix typo 2015-05-02 07:34:22 +09:00
Clint Shryock 3c6cec4fcd Fix indentation, which was causing a rendering error in middleman 2015-05-01 16:52:30 -05:00
Radek Simko 3d665ddfcf provider/aws: Add support for alias record to Route53 2015-05-01 22:43:04 +01:00
Sander van Harmelen 907eee24f2 Updating the docs 2015-05-01 18:50:57 +02:00
Christopher Tiwald 282c96f0e9 aws: Add docs for aws_vpn_connection resources. 2015-05-01 12:23:39 -04:00
Radek Simko bafabf17be provider/aws: Expose zone_id from elb 2015-05-01 08:07:33 +01:00
Camilo Aguilar 338ae601bc providers/aws: Implements DHCP Options Set support. 2015-04-30 17:52:04 -04:00
Paul Hinze a9de720a4e Merge pull request #1708 from hashicorp/f-elb-source-security-group
providers/aws: add source_security_group to elb
2015-04-30 16:10:02 -05:00
Paul Hinze d30d88e327 Merge pull request #1655 from hashicorp/f-build-graph-during-plan
core: validate on verbose graph to detect some cycles earlier
2015-04-30 16:08:33 -05:00
Mitchell Hashimoto af5ac59188 Merge pull request #1723 from apparentlymart/s3remotestate
S3 Remote State Backend
2015-04-30 13:25:33 -07:00
Paul Hinze 043387fc8f docs: Fix styling in provider code block
Font was different from rest of the page and very weird lookin'
2015-04-30 14:50:21 -05:00
Martin Atkins 53e93d6f63 S3 remote stage storage backend, against the new remote state API.
Stores state in a particular key in a given S3 bucket.
2015-04-30 09:21:49 -07:00
Christopher Tiwald 46296db9dc docs: vpn_gateway vpc_ids are optional, not required.
This is simply a mistake in the documentation. The code already leaves
this as optional.
2015-04-30 10:39:56 -04:00
TANABE Ken-ichi 638ca1e0df providers/aws: Add docs for aws_proxy_protocol_policy 2015-04-30 22:24:14 +09:00
Dave Cunningham f6554fb4a9 Support Google Cloud DNS, Fix #1148 2015-04-30 01:32:34 -04:00
Mitchell Hashimoto b0f90fe2be Merge pull request #1746 from ctiwald/ct/vpn-support
Add support for AWS customer gateways
2015-04-29 20:22:27 -07:00
Christopher Tiwald fdb25cca8a aws.erb: It's "docs", not "doc". Oops. 2015-04-29 21:49:25 -04:00
Christopher Tiwald 2b4fb16e3a aws: Add docs for aws_customer_gateway. 2015-04-29 21:33:00 -04:00
Mitchell Hashimoto 136402afe9 Merge pull request #1726 from skfmu/f-openstack-add-availability-zones
provider/openstack: Add availability zones for OpenStack block storage
2015-04-29 17:38:19 -07:00
Mitchell Hashimoto fa85e6b769 Merge pull request #1645 from dtan4/network-acl-tags-doc
website: Add Network ACL tags document
2015-04-28 20:50:47 -07:00
Mitchell Hashimoto 5d4c67c462 website: add ebs_volume 2015-04-28 20:49:21 -07:00
Mitchell Hashimoto d354cae524 Merge pull request #1685 from ctiwald/master
provider/aws: Implement support for various AWS ELB cookie stickiness policies
2015-04-28 20:24:11 -07:00
Mitchell Hashimoto cbc2891c54 Merge pull request #1722 from jwegis/patch-1
website: Update header title to "Mailgun Provider"
2015-04-28 20:19:07 -07:00
Mitchell Hashimoto 8f3e188f84 Merge pull request #1706 from hashicorp/d-module-intro-provider-config
docs: Clarify provider config in modules intro
2015-04-28 14:34:51 -07:00
ketzacoatl 324b1702a2 Add an example to module docs: terraform taint
While the taint docs make mention of this capabilities, it isn't clear what to do.
2015-04-28 15:20:13 -04:00
John Wegis 5495381c38 Update header title to "Mailgun Provider"
Update the Mailgun provider header title to "Mailgun Provider" so that it is consistent with the other provider pages.
2015-04-28 10:24:49 -07:00
Paul Hinze e4e6ac5d91 providers/aws: add source_security_group to elb 2015-04-28 09:40:19 -05:00
Paul Hinze b8457bde32 docs: Clarify provider config in modules intro
closes #1693
2015-04-28 09:01:19 -05:00
Paul Hinze 40262b0284 Merge pull request #1692 from trumant/openstack_security_group_docs_clarification
Clarify that the OpenStack security group resource can have many rules
2015-04-28 08:51:41 -05:00
Paul Hinze fda73e3843 Merge pull request #1705 from trumant/debug_logging_docs
Adding doc that explains how to configure/use logging
2015-04-28 08:50:17 -05:00
Travis Truman 4dc7e083ef Adding doc that explains how to configure/use logging 2015-04-28 09:43:39 -04:00
Joshua Lund 68e4fcc614 Fix minor typo in DME documentation. 2015-04-27 17:48:38 -06:00
Paul Hinze ce49dd6080 core: graph command gets -verbose and -draw-cycles
When you specify `-verbose` you'll get the whole graph of operations,
which gives a better idea of the operations terraform performs and in
what order.

The DOT graph is now generated with a small internal library instead of
simple string building. This allows us to ensure the graph generation is
as consistent as possible, among other benefits.

We set `newrank = true` in the graph, which I've found does just as good
a job organizing things visually as manually attempting to rank the nodes
based on depth.

This also fixes `-module-depth`, which was broken post-AST refector.
Modules are now expanded into subgraphs with labels and borders. We
have yet to regain the plan graphing functionality, so I removed that
from the docs for now.

Finally, if `-draw-cycles` is added, extra colored edges will be drawn
to indicate the path of any cycles detected in the graph.

A notable implementation change included here is that
{Reverse,}DepthFirstWalk has been made deterministic. (Before it was
dependent on `map` ordering.) This turned out to be unnecessary to gain
determinism in the final DOT-level implementation, but it seemed
a desirable enough of a property that I left it in.
2015-04-27 09:23:47 -05:00
Travis Truman eb977aa5fd Clarify that the security group resource can have many rules 2015-04-27 10:05:54 -04:00
Grégoire Pineau a6716cc1a4 [Doc] Fixed link 2015-04-27 15:00:38 +02:00
skfmu 2c32988743 Added availability zones for OpenStack block storage. 2015-04-27 05:52:45 +00:00
Christopher Tiwald d42441f9cd aws: Add docs for app_cookie_stickiness_policy. 2015-04-26 18:57:40 -04:00
Christopher Tiwald 30f8fd738a aws: Add docs for lb_cookie_stickiness_policy. 2015-04-26 18:05:43 -04:00
Mitchell Hashimoto 3d367794e9 Merge pull request #1676 from justincampbell/providers-link-from-resources
website: doc home link goes back to providers from resource
2015-04-25 17:07:07 -07:00
Justin Campbell 17ef529ac3 website: Link to canned ACL list for s3 buckets 2015-04-25 07:35:53 -04:00
Justin Campbell 774e7c31a2 Doc home link goes back to providers from resource
Changes the "Documentation Home" link in the sidebar to go back to the
list of providers instead of all the way back to the documentation home
page.
2015-04-25 07:28:51 -04:00
Daisuke Fujita 5813c22c3e Remove extra = signs from Network ACL document 2015-04-24 03:11:00 +09:00
Paul Hinze ca8e405273 Merge pull request #1647 from TimeIncOSS/update-docs
Update docs for Route53 + S3 bucket
2015-04-23 07:41:59 -05:00
Radek Simko 17baf0bb2f tags added to s3_bucket docs 2015-04-23 13:25:13 +01:00
Radek Simko 9b182c13dd route53_zone - docs updated (tags + name_servers) 2015-04-23 13:22:04 +01:00
Panagiotis Moustafellos 6bb8947d16 providers/aws: aws_elb incr. idle_timeout to 60s
per docs
http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/config-idle-timeout.html
2015-04-23 12:46:52 +03:00
Daisuke Fujita 1182238f81 Add Network ACL tags document 2015-04-23 18:05:07 +09:00
Paul Thrasher b7683d1a39 Typo in website docs for remote-exec
Just a simple typo fix.
2015-04-22 15:00:16 -07:00
Mitchell Hashimoto af4396aa0d Merge pull request #1621 from hashicorp/f-envs
Set variables from env vars
2015-04-22 15:50:56 +02:00
Radek Simko 3aae74f60c route53_record docs - missing newline added 2015-04-22 14:09:06 +01:00
Mitchell Hashimoto 8ca42f832e Merge pull request #1525 from Banno/route53-zone-nameservers
providers/aws: Expose Route53 zone nameservers for parent zone NS record
2015-04-22 12:10:27 +02:00
Mitchell Hashimoto 5f4e2d9b27 website: clarify script args [GH-236] 2015-04-22 09:03:38 +02:00
Mitchell Hashimoto 9037a3a4bc Merge pull request #1426 from dainis/master
provider/google: add additional options to google provider
2015-04-22 08:50:22 +02:00
Mitchell Hashimoto 887f1b3d12 Merge branch 'elb-connection-settings' of https://github.com/jwaldrip/terraform into jwaldrip-elb-connection-settings 2015-04-22 08:38:19 +02:00