Commit Graph

758 Commits

Author SHA1 Message Date
Clint Shryock 30572212f2 Merge branch 'master' into pr-2779
* master: (86 commits)
  providers/google: Fix reading account_file path
  providers/google: Fix error appending
  providers/google: Return if we could parse JSON
  providers/google: Change account_file to JSON
  providers/google: Default account_file* to empty
  providers/google: Add account_file/account_file_contents ConflictsWith
  providers/google: Document account_file_contents
  providers/google: Use account_file_contents if provided
  providers/google: Add account_file_contents to provider
  Update CHANGELOG.md
  Update CHANGELOG.md
  use d.Id()
  Update CHANGELOG.md
  Update CHANGELOG.md
  scripts: change website_push to push from HEAD
  update analytics
  core: fix crash on provider warning
  provider/aws: Update source to comply with upstream breaking change
  Update CHANGELOG.
  provider/aws: Fix issue with IAM Server Certificates and Chains
  ...
2015-07-29 15:54:56 -05:00
Justin Campbell 773852e2d5 providers/google: Change account_file to JSON
If JSON fails to parse, treat it as a file path
2015-07-29 15:59:32 -04:00
Justin Campbell c7954dbf74 providers/google: Document account_file_contents 2015-07-29 15:59:32 -04:00
Clint 16c1deffe0 Merge pull request #2846 from tphummel/patch-1
aws_sqs_queue argument description fix
2015-07-29 11:04:57 -05:00
Dave Cunningham 5544dac7c6 Merge branch 'master' into gce_autoscaling 2015-07-27 20:48:39 -04:00
Dave Cunningham 1ec247ef37 Use new autoscaler / instance group manager APIs. 2015-07-27 20:47:10 -04:00
Tom Hummel 6931e8520e aws_sqs_queue argument description fix
the descriptions of `delay_seconds` and `visibility_timeout_seconds` appear to be swapped.
2015-07-25 12:49:10 -07:00
Jesse Szwedko 5554942721 This adds the source_dest_check attribute to the aws_network_interface resource
Defaults to true to be consistent with AWS
2015-07-23 06:16:51 +00:00
John Engelman cbe9be4571 Add website_domain for S3 buckets. 2015-07-22 10:38:28 -05:00
Clint f979fd7dee Merge pull request #2571 from TimeIncOSS/f-aws-autogenerated-elb-name
provider/aws: Allow ELB name to be generated
2015-07-21 15:52:36 -05:00
Dave Cunningham c6f0bf479b Merge branch 'master' into gce_autoscaling 2015-07-20 14:25:26 -04:00
Marc Tamsky 521451db4d provider/aws/aws_instance: add new argument `instance_initiated_shutdown_behavior`,
accepts string values of 'stop' or 'terminate'.

Signed-off-by: Marc Tamsky <tamsky@users.noreply.github.com>
2015-07-18 09:45:34 -07:00
Mitchell Hashimoto 55985a6f9e Merge pull request #2752 from SamClinckspoor/patch-1
website: Fixed typo in AWS_CLOUDWATCH_METRIC_ALARM docs
2015-07-17 10:49:38 -07:00
Sander van Harmelen 28b7b53be6 Updates and tweaks 2015-07-16 17:40:11 +02:00
Sam Clinckspoor b54b35904d Fixed typo in AWS_CLOUDWATCH_METRIC_ALARM docs 2015-07-16 17:27:33 +02:00
Jon Simpson a2e14c0464 Fix typo 2015-07-15 16:48:53 +01:00
Clint abe62e635a Merge pull request #2724 from hashicorp/f-aws-asg-updates
provider/aws: Improved Auto Scaling Groups updates
2015-07-15 08:42:54 -05:00
Radek Simko 650b13ebd4 provider/aws: Add docs for vpc_endpoint 2015-07-14 18:34:21 +01:00
Clint Shryock 55a1a31c2b provider/aws: document that availability zones are now optional in ASGs 2015-07-14 10:24:16 -05:00
Radek Simko 206278bac0 google: Update google_container_cluster attribute docs according to reality 2015-07-11 19:33:45 +01:00
Dave Cunningham 0df8bf90c7 Merge pull request #2357 from TimeIncOSS/gke
Add support for GKE (Google Container Engine)
2015-07-11 14:14:50 -04:00
Radek Simko 70c69e445c Add docs for google_container_cluster 2015-07-11 18:56:24 +01:00
Patrick Lee 80af6825fb changed combine() to concat() in docs
The example of the concat() function uses combine() instead of concat().
2015-07-09 17:04:36 -06:00
Sander van Harmelen 0dc0cff14d Merge pull request #2657 from blueharford/master
provisioner/chef: add secret key
2015-07-09 20:20:46 +02:00
Anthony Stanton 49a1f21a09 Use correct terms in DB Subnet Group docs 2015-07-09 17:39:05 +02:00
Joshua Seidel 147efbc52c update markdown 2015-07-09 10:13:54 -04:00
Clint b169a53786 Merge pull request #2642 from hashicorp/f-aws-elasticache-maintenance-window
provider/aws: Add maintenance window to ElastiCache cluster
2015-07-08 13:10:32 -06:00
Clint Shryock ef28007988 merge master 2015-07-08 13:05:33 -06:00
Patrick Gray b32008804e fix markdown for aws_iam_policy_attachment 2015-07-08 14:25:57 -04:00
Clint 82d142cc5f Merge pull request #2634 from hashicorp/f-aws-elasticache-redis-s3-snap
provider/aws: Add support for restoring from Redis backup stored in S3
2015-07-08 11:51:23 -06:00
Clint Shryock 49a01ee787 provider/aws: Add maintenance window to ElastiCache cluster
Implements #2612
2015-07-07 10:41:46 -06:00
Clint Shryock 91ea40d157 provider/aws: Update Launch Configuration docs to reflect required device name 2015-07-06 16:32:18 -06:00
Clint Shryock edf8948d52 provider/aws: Add support for restoring from Redis backup stored in S3
Fixes #2377
2015-07-06 16:19:15 -06:00
Radek Simko 1e56b607a0 Merge pull request #2599 from kelcecil/ebs_optimized
Add ebs_optimized argument to launch_configuration docs
2015-07-05 09:29:58 +02:00
Radek Simko 8d6e2eb064 Merge pull request #2609 from CpuID/cpuid_ecs_task_definition_docs
Updated docs for aws_ecs_task_definition, to avoid confusion.
2015-07-03 19:53:59 +02:00
Nathan Sullivan bba53d46a6 oops :) 2015-07-04 03:41:44 +10:00
Nathan Sullivan 21a336fb4a updates as per @radeksimko's comments 2015-07-03 18:30:55 +10:00
Radek Simko 03dc6c4879 Merge pull request #2610 from CpuID/cpuid_ecs_service_docs_iam
Fix aws_ecs_service iam_role docs
2015-07-03 07:45:31 +02:00
Kel Cecil 857f139404 Add ebs_optimized argument to launch_configuration docs 2015-07-02 13:03:27 -04:00
Clint 460d49fd52 Merge pull request #2062 from reverbdotcom/adding-rds-snapshots
Adding rds snapshots
2015-07-02 08:56:51 -05:00
Nathan Sullivan 5edbb37994 fix variable for aws_iam_role 2015-07-02 21:53:01 +10:00
Nathan Sullivan 928d5f76ab updated docs for aws_ecs_task_definition to avoid confusion 2015-07-02 20:34:58 +10:00
Dave Cunningham 447da2177e Add ForceNew metadata_startup_script field 2015-07-01 21:24:34 -04:00
Paul Hinze 3dc055f18b Merge pull request #2582 from Tomohiro/fix-iam-user-access-key-example
Remove status argument from `aws_iam_access_key` example usage
2015-07-01 13:23:31 -05:00
Daisuke Fujita 280313ed24 Fix page description of aws_iam_group_membership 2015-07-02 01:38:40 +09:00
Daisuke Fujita cf432a5acd Fix page title of aws_iam_group_membership 2015-07-02 01:37:36 +09:00
Tomohiro TAIRA 405ed57544 Remove status argument from `aws_iam_access_key`
`aws_iam_access_key` resource is not supported `status` field.

Example from https://www.terraform.io/docs/providers/aws/r/iam_access_key.html:

    resource "aws_iam_access_key" "lb" {
        user = "${aws_iam_user.lb.name}"
        status = "Active"
    }

    resource "aws_iam_user" "lb" {
        name = "loadbalancer"
        path = "/system/"
    }

Result:

    $ terraform plan
    There are warnings and/or errors related to your configuration. Please
    fix these before continuing.

    Errors:

      * aws_iam_access_key.lb: "status": this field cannot be set
2015-07-01 13:07:31 +09:00
Adam Enger d206d6d5d8 Adding snapshot_identifier to db_instance docs 2015-06-30 15:33:13 -05:00
John Ewart 7b7d754bb5 Minor change to docs 2015-06-30 11:43:13 -07:00
John Ewart ca7fe86c67 Update DynamoDB example docs to remove non-key attributes; update test to remove non-key attribute from attribute set to prevent infinite planning loops 2015-06-30 11:38:16 -07:00