Commit Graph

7405 Commits

Author SHA1 Message Date
Paul Hinze 928f534cfc template_file: source contents instead of path
Building on the work of #3846, deprecate `filename` in favor of a
`template` attribute that accepts file contents instead of a path.

Required a bit of work in the interpolation code to prevent Terraform
from assuming that template interpolations were resource variables that
needed to be resolved. Leaving them as "Unknown Variables" prevents
interpolation from happening early and lets the `template_file` resource
do its thing.
2015-11-13 11:24:20 -06:00
Paul Hinze 44f259bd74 provider/aws: homedir expand in s3 object source
fixes #3856
2015-11-13 11:21:22 -06:00
clint shryock e94fcdb9df add validation for cookie stickiness 2015-11-13 10:46:27 -06:00
clint shryock b81f9a9c52 provider/aws: Fix issue with LB Cookie Stickiness and empty expiration period 2015-11-13 10:34:15 -06:00
Joe Topjian edd8e722bf provider/openstack: Make Networking Port attributes more intuitive
This commit makes some quick updates to the port attributes to make them
more intuitive:

* `security_groups` to `security_group_ids`: since the port is expecting
IDs and not security group names like in other areas of OpenStack.

* `admin_state_up`: change to Boolean to match this same attribute on
other resources.

* `fixed_ips` to `fixed_ip`: while multiple `fixed_ip` blocks can be
specified, only one fixed IP can be specified in each block.
2015-11-13 04:46:12 +00:00
Joe Topjian 536ba76b21 Update CHANGELOG.md 2015-11-12 21:14:28 -07:00
Joe Topjian d0911649e3 Merge pull request #3903 from jtopjian/add-port-id-to-router-interface
provider/openstack: Add port id to router interface
2015-11-12 21:11:48 -07:00
Joe Topjian 4d6e3289bc provider/openstack: adding test for router interface port 2015-11-13 04:04:05 +00:00
Kirill Shirinkin 3a1a242a7a provider/openstack: Allow port_id for router interface 2015-11-13 03:13:12 +00:00
James Nugent 2dbd9b47e4 Update CHANGELOG.md 2015-11-12 16:58:26 -06:00
James Nugent 839fc5bfee Merge pull request #3900 from Banno/fix-aws-route53-record-failover-weight
provider/aws: fix for creating failover route53 records
2015-11-12 16:56:59 -06:00
clint shryock 6fa69ede1c add debugging statements to add/remove listeners 2015-11-12 16:20:54 -06:00
Luke Amdor 10ca0559ae provider/aws: no weight for all set_identifier 2015-11-12 16:15:05 -06:00
Paul Hinze 73ce6d184a chef: read key contents instead of paths
Builds on the work of #3846, shifting the Chef provisioner's
configuration options from `secret_key_path` and `validation_key_path`
over to `secret_key` and `validation_key`.
2015-11-12 16:11:44 -06:00
clint shryock c60a963908 providers/aws: Retry deleting IAM Server Cert on dependency violation
This will retry deleting a server cert
if it throws an error about being in use with an ELB (that we've likely just
  deleted)

Includes test for ELB+IAM SSL cert bug dependency violation
2015-11-12 16:07:34 -06:00
Brandon Rochon f148ef73ec Merge remote-tracking branch 'upstream/master' into rds_pub_access_param
Change-Id: Ib4aaf478f4662b43961f80fbfd44199fca651180
2015-11-12 14:04:49 -08:00
Paul Hinze b6aed3fec3 communicator/ssh: fix typos travis didn't catch
I think rebasing and splitting got me into a weird state. This should
fix the build failures on master.
2015-11-12 16:00:28 -06:00
Paul Hinze c897d0a2c7 Update CHANGELOG.md 2015-11-12 15:36:28 -06:00
Paul Hinze d6a61bdccf Merge pull request #3846 from hashicorp/phinze/pathorcontents
ssh: accept private key contents instead of path
2015-11-12 15:35:16 -06:00
Brandon Rochon b6738f13c1 Issue #3894 RDS publicly_accessible param shouldn't force new resource
Change-Id: I833f9e07f3fc1f6ee475673ad978b3982f0b6273
2015-11-12 13:33:27 -08:00
Paul Hinze 7ffa66d1a5 ssh: accept private key contents instead of path
We've been moving away from config fields expecting file paths that
Terraform will load, instead prefering fields that expect file contents,
leaning on `file()` to do loading from a path.

This helps with consistency and also flexibility - since this makes it
easier to shift sensitive files into environment variables.

Here we add a little helper package to manage the transitional period
for these fields where we support both behaviors.

Also included is the first of several fields being shifted over - SSH
private keys in provisioner connection config.

We're moving to new field names so the behavior is more intuitive, so
instead of `key_file` it's `private_key` now.

Additional field shifts will be included in follow up PRs so they can be
reviewed and discussed individually.
2015-11-12 14:59:14 -06:00
Clint 4252a3e557 Update CHANGELOG.md 2015-11-12 14:28:39 -06:00
Clint 1488bbf6c7 Merge pull request #3887 from hashicorp/elb-ssl-cert-fix
providers/aws: Document and validate ELB ssl_cert and protocol require
2015-11-12 14:28:12 -06:00
clint shryock 5cafe740ff update wording on ssl cert error 2015-11-12 14:25:50 -06:00
clint shryock 1b2e068b19 add extra test block 2015-11-12 14:25:50 -06:00
clint shryock fddafd2b96 providers/aws: Document and validate ELB ssl_cert and protocol requirements 2015-11-12 14:25:50 -06:00
Clint dcf40661c8 Merge pull request #3863 from hashicorp/b-aws-elb-access-fix
providers/aws: Fix issue with removing access_logs from ELB
2015-11-12 14:24:58 -06:00
James Nugent 9d27504133 Merge pull request #3866 from br0ch0n/sqs_queue_doc_example
Add example of redrive_policy to docs.

Fixes #2711.
2015-11-12 11:04:55 -06:00
James Nugent 86565559b2 Merge pull request #3886 from hashicorp/b-rename-tests
providers/aws/structure
2015-11-12 10:49:48 -06:00
clint shryock 12d2ae1438 patch TestExpandElasticacheParameters test 2015-11-12 10:45:49 -06:00
clint shryock e7e52ed98f Correct test method names so that they are ran 2015-11-12 10:36:22 -06:00
James Nugent d640cae0af Update CHANGELOG.md 2015-11-12 10:05:12 -06:00
James Nugent cbbe06388f Merge pull request #3883 from lwander/f-gcp-https-health-checks
provider/google: HTTPS Health Checks Resource + Tests & Documentation
2015-11-12 10:02:39 -06:00
James Nugent d96582e60f Merge pull request #3882 from ijin/iam-version
Align IAM version number to the current version (2012-10-17)
2015-11-12 10:00:27 -06:00
Lars Wander 28819603ba provider/google: HTTPS health checks resource + tests & documentation 2015-11-12 10:48:26 -05:00
Michael H. Oshita 90d70786ac Align IAM version number to the current version (2012-10-17) 2015-11-13 00:32:45 +09:00
Radek Simko 8935013f69 Merge pull request #3861 from chad-thompson/master
Update remote-config.html.markdown
2015-11-12 07:06:11 +00:00
Joe Topjian 3db7922b53 provider/openstack: Security Group Rule fixes
This commit fixes an issue with security group rules where the rules
were not being correctly computed due to a typo in the rule map.

Once rules were successfully computed, the rules then needed to be
converted into a Set so they can be correctly ordered.
2015-11-12 03:15:52 +00:00
Radek Simko 387d03e818 Update CHANGELOG.md 2015-11-12 00:02:58 +00:00
Radek Simko 15a568c806 Merge pull request #3828 from TimeIncOSS/b-aws-ecs-service-del
provider/aws: Treat ecs_service w/ Status==INACTIVE as deleted
2015-11-12 00:01:50 +00:00
Radek Simko bcd63f62a3 provider/aws: Log removal of INACTIVE ECS service 2015-11-11 23:53:59 +00:00
Brandon Rochon 5bdba00082 add example of redrive_policy #2711
Change-Id: Ia1b26bf32d16628c3ef5cf99745ba7c222d3251e
2015-11-11 13:50:54 -08:00
clint shryock 7f2244183c providers/aws: Fix issue with removing access_logs from ELB 2015-11-11 15:25:24 -06:00
Chad Thompson d309f8b82b Update remote-config.html.markdown
Replace "shared storaged" with "shared storage".  (Very minor change.)
2015-11-11 13:09:26 -06:00
James Nugent 2f163701e8 Update CHANGELOG.md 2015-11-11 12:18:02 -05:00
James Nugent 0567f894ba Merge pull request #3859 from hashicorp/b-destroy-target
Clear up `destroy --target` message
2015-11-11 12:15:18 -05:00
Clint 4d37859f02 Update CHANGELOG.md 2015-11-11 11:06:37 -06:00
Clint 45773184c4 Merge pull request #3694 from hashicorp/b-aws-retry-hook
provider/aws: Add a retry function to rescue an error in creating Lifecycle Hooks
2015-11-11 11:06:04 -06:00
Jake Champlin 39e7f42490 Clear up `destroy --target` message
When destroying infrastructure with `--target`, print out which
infrastructure will be destroyed instead of saying `Terraform will
delete all your managed infrastructure`.

```
 terraform destroy --target aws_instance.test2 --target aws_instance.test1
Do you really want to destroy?
  Terraform will delete the following infrastructure:
        aws_instance.test2
        aws_instance.test1
  There is no undo. Only 'yes' will be accepted to confirm
```

Omitting `--target` arguments will use the default input description.

```
$ terraform destroy
Do you really want to destroy?
  Terraform will delete all your managed infrastructure.
  There is no undo. Only 'yes' will be accepted to confirm.
```
2015-11-11 12:04:58 -05:00
clint shryock b51f425dac replace big retry func with resource.Retry 2015-11-11 10:53:23 -06:00