Commit Graph

2451 Commits

Author SHA1 Message Date
Max Englander fa94d7f7ec Merge branch 'master' into 2087-consul-service-resource 2015-10-29 11:43:12 -04:00
Max Englander 5f5fd7c6e6 make good use of ForceNew in consul_agent_service 2015-10-29 11:39:27 -04:00
Clint cb2ecf5733 Merge pull request #3255 from Runscope/local-kinesis
provider/aws: allow local kinesis
2015-10-29 08:24:07 -05:00
Paul Hinze 38c20a58c7 Merge pull request #3636 from rakutentech/fix-connection-info
provider/vsphere: Fix d.SetConnInfo error in case of a missing IP address
2015-10-29 07:28:16 -05:00
Max Englander da70103a05 Merge branch 'master' of github.com:hashicorp/terraform into 2087-consul-service-resource 2015-10-29 05:04:40 -04:00
Max Englander 8d6b71e2ae use ForceNew on just about all catalog entry attributes; struggle in the hell of 'diffs mismatch' 2015-10-29 05:04:25 -04:00
Radek Simko 678c7e905a Merge pull request #3094 from TimeIncOSS/f-aws-cloudtrail
provider/aws: Add support for CloudTrail
2015-10-29 07:03:17 +00:00
clint shryock 2cd47ec195 add test for elasticache cluster and topic arn 2015-10-28 14:09:45 -05:00
clint shryock 9aeb04909c Merge branch 'master' into pr-2836
* master: (335 commits)
  Update CHANGELOG.md
  config: return to the go1.5 generated lang/y.go
  Update CHANGELOG.md
  Allow cluster name, not only ARN for aws_ecs_service
  Update CHANGELOG.md
  Add check errors on reading CORS rules
  Update CHANGELOG.md
  website: docs for null_resource
  dag: use hashcodes to as map key to edge sets
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  Use hc-releases
  provider/google: Added scheduling block to compute_instance
  Use vendored fastly logo
  Use releases for releases
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update vpn.tf
  Update CHANGELOG.md
  ...
2015-10-28 13:20:10 -05:00
Radek Simko 7265bdaaf0 aws: Add acceptance test for aws_cloudtrail 2015-10-28 17:13:14 +00:00
Radek Simko a618b048cf aws: Add support for aws_cloudtrail 2015-10-28 17:13:14 +00:00
Radek Simko 91f4be2261 Merge pull request #3668 from TimeIncOSS/b-aws-ecs-cluster-arn
provider/aws: Allow cluster name, not only ARN for aws_ecs_service
2015-10-28 16:28:47 +00:00
Radek Simko 0d8d6fde79 Merge pull request #2636 from TimeIncOSS/f-aws-cloudformation
provider/aws: Add aws_cloudformation_stack
2015-10-28 16:16:14 +00:00
Radek Simko 784aadd505 Allow cluster name, not only ARN for aws_ecs_service 2015-10-28 15:43:42 +00:00
Clint 5cedd64a15 Merge pull request #3387 from kjmkznr/s3-cors
provider/aws: Add CORS settings to S3 bucket
2015-10-28 10:09:44 -05:00
Kazunori Kojima 122790d32b Add check errors on reading CORS rules 2015-10-28 09:19:37 +09:00
Paul Hinze 1152ee9a53 Merge pull request #3244 from Banno/make-null-resource-more-useful
Add triggers to the null_resource
2015-10-27 13:30:54 -05:00
Dave Cunningham 66336f577a Merge pull request #3643 from lwander/f-gcp-instance-scheduling
provider/google: Added scheduling block to compute_instance
2015-10-26 19:29:33 -04:00
Clint 3ce656b007 Merge pull request #2890 from pforman/asg-termination
Update AWS ASG termination policy code and tests
2015-10-26 16:42:53 -05:00
Lars Wander 5a311dbd11 provider/google: Added scheduling block to compute_instance 2015-10-26 16:16:06 -04:00
Dave Cunningham c0bf7aecb3 Merge pull request #3554 from lwander/f-gcp-version
provider/google: Accurate Terraform Version
2015-10-26 02:59:51 -04:00
Dave Cunningham a4eee72c78 Merge pull request #3620 from lwander/b-gcp-large-instance-group-timeout
provider/google: Fixed timeout bug on large instance groups
2015-10-26 02:56:18 -04:00
Takaaki Furukawa 8390154968 provider/vsphere: Fix d.SetConnInfo error in case of a missing IP address 2015-10-26 10:32:19 +09:00
Daniel Imfeld f23a8bfe4e Update list of GCE service scope short names 2015-10-23 17:58:04 -05:00
Lars Wander 0c81a9c108 provider/google: Fixed timeout bug on large instance groups 2015-10-23 15:12:53 -04:00
Sander van Harmelen 477988497e Merge pull request #3613 from svanharmelen/b-cloudstack-vpc
provider/cloudstack: add `computed` flag to the `network_domain` parameter
2015-10-23 10:06:37 +02:00
Sander van Harmelen aa5d02104c Add `computed` flag to the `network_domain` parameter
Without this flag you will get a diff based on the `network_domain`
parameter, if you not specify the parameter.
2015-10-23 09:54:54 +02:00
Jeff Mitchell 1373a6086b Use cleanhttp for new http clients 2015-10-22 14:23:59 -04:00
Dave Cunningham 53b64909ec Merge pull request #3553 from lwander/f-gcp-oauth
provider/google: OAuth2 support
2015-10-22 00:44:16 -04:00
Martin Atkins dd56b39e0c Codeploy deployment group app_name instead of application_name.
The corresponding resource is called aws_codeploy_app, so for consistency
we'll name the attribute app_name instead of application_name.
2015-10-21 08:34:46 -07:00
Christopher Tiwald 390f226eb5 aws: Add aws_codedeploy_deployment_group tests 2015-10-20 18:05:40 -04:00
Christopher Tiwald a546a12c2d aws: Add support for aws_codedeploy_deployment_group resources 2015-10-20 18:05:40 -04:00
Christopher Tiwald 42c077700a aws: Add acceptance tests for "aws_codedeploy_app" resources. 2015-10-20 18:05:39 -04:00
Christopher Tiwald e59fb4e6ca aws: Add support for "aws_codedeploy_app" resources. 2015-10-20 18:05:39 -04:00
Lars Wander bba2c3221d Added oauth2 support for GCP 2015-10-20 15:08:04 -04:00
Lars Wander d4f7cdc877 GCP UserAgent now shows accurate Terraform version 2015-10-20 14:45:11 -04:00
Jeff Mitchell 5fa5c4bc53 Use new packngo API allowing passing in a custom http.Client 2015-10-19 13:03:28 -04:00
Jeff Mitchell b0ceffc322 Remove usage from dependencies as well. Other dependencies need upstream merging to completely solve this. 2015-10-19 12:06:34 -04:00
Paul Hinze 97cb207fc5 Merge pull request #3333 from aybabtme/use-official-digitalocean-client
use official Go client for DigitalOcean provider
2015-10-16 09:11:04 -05:00
Clint 2f94e575ef Merge pull request #3300 from Runscope/fix-dynamodb-gsi-bug
provider/aws: fix bug with reading GSIs from dynamodb
2015-10-15 10:04:33 -05:00
Sander van Harmelen 2a24d52721 Merge pull request #3502 from joelmoss/chef_policy_unused_runlist
[chef provisioning] When use_policyfile is given, the run list is not used, so don't require it
2015-10-15 12:40:45 +02:00
Max Englander 7b9ec59258 #2087: consul_catalog_entry can set a service 2015-10-15 04:06:52 -04:00
Paul Hinze 3fbeb326cd provider/azure: acc tests fixes
* avoid name collisions
 * update image names
2015-10-14 22:59:33 -05:00
Paul Hinze f6e525e531 provider/google: one more test that should skip predefined_acl
it was depreceted in https://github.com/hashicorp/terraform/pull/3272
2015-10-14 22:36:19 -05:00
Paul Hinze 0efffc67f0 provider/google: storage bucket tests shouldn't not check predefined_acl
it was depreceted in https://github.com/hashicorp/terraform/pull/3272
2015-10-14 22:17:34 -05:00
Paul Hinze b2b41192ac provider/google: container test needed bigger instance to pass 2015-10-14 22:16:58 -05:00
Max Englander fce89ec1ae Merge branch 'master' into 2087-consul-service-resource 2015-10-14 22:51:25 -04:00
Paul Hinze c1aab4cfaf Merge pull request #3507 from hashicorp/b-gce-metadata
provider/google: one more fix to GCE metadata
2015-10-14 21:40:50 -05:00
Martin Atkins 3708e752af Merge pull request #3138 from mastor/master
Support tags for aws_db_subnet_group
2015-10-14 19:36:45 -07:00
Paul Hinze 4f400a1944 provider/google: one more fix to GCE metadata
In #3501 @lwander got us almost all the way there, but we still had
tests failing. This seemed to be because GCE sets
`metadata.startup-script` to a blank string on instance creation, and if
a user specifies any `metadata` in their config this is seen as the
desired full contents of metadata, so we get a diff trying to remove
`startup-script`.

Here, to address this, we just proactively remove the "startup-script"
key from `Read`, and then we enforce that "metadata_startup_script"
is the only way to configure startup scripts on instances.
2015-10-14 21:34:33 -05:00