Commit Graph

5840 Commits

Author SHA1 Message Date
Clint Shryock ef28007988 merge master 2015-07-08 13:05:33 -06:00
Clint 655e1ddf78 Update CHANGELOG.md 2015-07-08 12:33:03 -06:00
Clint d34bd0d227 Merge pull request #2640 from hashicorp/b-aws-spot-instance-fix
provider/aws: Fix issue where spot instance requests would crash
2015-07-08 12:32:13 -06:00
Clint ec6f866561 Update CHANGELOG.md 2015-07-08 12:31:06 -06:00
Clint f2ff63d0da Merge pull request #2644 from hashicorp/b-aws-sg-account-update
provider/aws: Fix issue in Classic env with external Security Groups
2015-07-08 12:29:50 -06:00
Clint c2cf7442ea Update CHANGELOG.md 2015-07-08 12:05:32 -06: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 cc79e6cb8d provider/aws: Fix issue in Classic env with external Security Groups
Linking a security group from another account requires setting the UserID, which
we were stripping out
2015-07-07 12:06:36 -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 2fedaa9a4b provider/aws: Fix issue where spot instance requests would crash
Requests that are pending do not have an InstanceID
2015-07-07 09:48:04 -06:00
Clint b4c1c223ff Merge pull request #2635 from hashicorp/b-aws-update-lc-docs
provider/aws: Update Launch Configuration docs to reflect required device name
2015-07-06 16:33:04 -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
Sander van Harmelen e800a8d6cc Merge pull request #2624 from jeroendekorte/f-chef-provisioner-http_proxy
provisioner/chef: Fix Chef provisioner http proxy
2015-07-05 09:53:46 +02: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 94bc96d3de Update CHANGELOG.md 2015-07-04 07:09:47 +02:00
Radek Simko de4e03c046 Merge pull request #2620 from TimeIncOSS/b-plan-counts
core: Return correct number of planned updates
2015-07-04 07:08:24 +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
Jeroen de Korte 1c14bfd04d Added the HTTPS proxy option 2015-07-03 16:27:52 +02:00
Jeroen de Korte 007ab6e503 Fixed the http_proxy 2015-07-03 15:04:58 +02:00
Radek Simko e376f61d1d core: Return correct number of planned updates 2015-07-03 13:22:10 +02: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
Radek Simko 487aba6a9c Update CHANGELOG.md 2015-07-03 00:01:09 +02:00
Radek Simko 0ba041912e Add regression test for db_subnet_group w/ underscores
- ref https://github.com/hashicorp/terraform/issues/2603
2015-07-02 23:58:46 +02:00
Radek Simko 127fa3090f Merge pull request #2604 from CpuID/cpuid_gh2603
Allow underscores in aws_db_subnet_group name
2015-07-02 23:57:49 +02:00
Paul Hinze 60490033a1 Update CHANGELOG.md 2015-07-02 16:12:17 -05:00
Paul Hinze c8a0d3f0b9 Merge pull request #2615 from hashicorp/b-ssh-agent-masks-key-file
communicator/ssh: sort agent after static keyfile
2015-07-02 16:09:43 -05:00
Paul Hinze 801aaf1eec communicator/ssh: sort agent after static keyfile
In the SSH client configuration, we had SSH Agent authentication listed
before the static PrivateKey loaded from the `key_file` setting.
Switching the default of the `agent` setting exposed the fact that the
SSH agent overrides the `key_file` during the handshake. By listing the
`key_file` first, we catch the provided key before any query goes out to
the agent.

Adds a key-based authentication SSH test to cover this new behavior. It
fails without the reordering on any machine with an SSH agent running.

Fixes #2614
2015-07-02 15:41:23 -05:00
Paul Hinze c33bc350cc Update CHANGELOG.md 2015-07-02 13:13:11 -05:00
Paul Hinze 9de673b7e2 Merge pull request #2613 from hashicorp/b-input-var-default
core: don't prompt for variables with defaults
2015-07-02 13:12:34 -05:00
Kel Cecil 857f139404 Add ebs_optimized argument to launch_configuration docs 2015-07-02 13:03:27 -04:00
Paul Hinze 5c38456b05 core: don't prompt for variables with defaults
In `helper/schema` we already makes a distinction between `Default`
which is always applied and `InputDefault` which is displayed to the
user for an empty field.

But for variables we just have `Default` which is treated like
`InputDefault`. This changes it to _not_ prompt the user for a value
when the variable declaration includes a default.

Treating this as a UX bugfix and the "don't prompt for variables w/
defaults set" behavior as the originally expected behavior we were
failing to honor.

Added an already-passing test to verify and cover the `helper/schema`
behavior.

Perhaps down the road we can add a `input_default` attribute to
variables to allow similar behavior to `helper/schema` in variables, but
for now just sticking with the fix.

Fixes #2592
2015-07-02 10:40:30 -05:00
Clint 3b56814fbd Update CHANGELOG.md 2015-07-02 08:58:15 -05: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
Nathan Sullivan c0b692b360 allow underscores in aws_db_subnet_group name, docs don't claim they are
allowed but they are.
2015-07-02 14:45:25 +10:00
Dave Cunningham e26a1b8c18 Merge pull request #2375 from sparkprime/startup-script
Add ForceNew metadata_startup_script field
2015-07-01 22:55:40 -04: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
Paul Hinze 75a5d3836a Merge pull request #2591 from dtan4/fix-iam-group-membership-website
website: Fix page title and description of IAM Group Membership website
2015-07-01 11:48:27 -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
Radek Simko 9a68a6b191 Update CHANGELOG.md 2015-07-01 07:32:03 +01:00
Radek Simko 1e8fb65925 provider/aws: Add regression test for ELB name validation
- prevent #2580 from hapenning again
2015-07-01 07:29:56 +01:00
Radek Simko 815c900aae Merge pull request #2580 from pmoust/b-aws-elb-A-Z
providers/aws: aws_elb: Allow alnum plus hyphen in name attribute
2015-07-01 07:28:16 +01:00
Panagiotis Moustafellos 0cbb815d28 providers/aws: aws_elb: Allow alnum plus hyphen in name attribute 2015-07-01 09:16:32 +03: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