ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,878 Commits 1 Branch 0 Tags 187 MiB
Commit Graph

11878 Commits

Author SHA1 Message Date
Paul Stack 34864d33b5 Update CHANGELOG.md 2016-08-12 12:36:12 +10:00
Evan Brown 93b2c71544 providers/google: Add google_compute_image resource (#7960) 
* providers/google: Add google_compute_image resource

This change introduces the google_compute_image resource, which allows
Terraform users to create a bootable VM image from a raw disk tarball
stored in Google Cloud Storage. The google_compute_image resource
may be referenced as a boot image for a google_compute_instance.

* providers/google: Support family property in google_compute_image

* provider/google: Idiomatic checking for presence of config val

* vendor: Update Google client libraries
 2016-08-12 12:35:33 +10:00
KOJIMA Kazunori 6ff3df8552 Fix invalid reference in iam_policy_document document page. (#8151) 2016-08-12 12:34:27 +10:00
Paul Stack f8e4166bee Update CHANGELOG.md 2016-08-12 12:24:21 +10:00
Max Englander c072c0dfbb #7013 add tls config support to consul provider (#7015) 
* #7013 add tls config support to consul provider

* #7013 add acceptance tests

* #7013 use GFM tables

* #7013 require one of {CONSUL_ADDRESS,CONSUL_HTTP_ADDR} when running consul acc tests
 2016-08-12 12:22:41 +10:00
Lars Wander 45219dbb4f Update CHANGELOG.md 2016-08-11 18:07:59 -04:00
Lars Wander ef9591952a Merge pull request #8115 from nwwebb/import-autoscaler 
provider/google: Support Import of 'google_compute_autoscaler'
 2016-08-11 18:07:22 -04:00
Lars Wander 82e2bd504b Update CHANGELOG.md 2016-08-11 18:06:07 -04:00
Lars Wander ad4ca17f05 Merge pull request #8121 from nwwebb/import-http-health-check 
provider/google: Support Import of 'google_resource_http_health_check'
 2016-08-11 18:05:42 -04:00
Lars Wander 6523ebd961 Update CHANGELOG.md 2016-08-11 18:04:25 -04:00
Lars Wander 4d631d525b Merge pull request #8122 from nwwebb/import-forwarding-rule 
provider/google: Support Import of 'google_compute_forwarding_rule'
 2016-08-11 18:04:06 -04:00
Lars Wander 01fb6c79a7 Update CHANGELOG.md 2016-08-11 18:03:35 -04:00
Lars Wander baec60459f Merge pull request #8133 from nwwebb/import-target-pool 
provider/google: Support Import of 'google_compute_target_pool'
 2016-08-11 18:02:33 -04:00
Paul Stack 691bcda026 Update CHANGELOG.md 2016-08-12 07:52:37 +10:00
Linda Xu 45c5675c8e add Aurora instance failover priority feature (#8087) 
* add Aurora instance failover priority feature

* promotion_tier move to input directly

* fix format issue
 2016-08-12 07:51:25 +10:00
James Nugent c9468efd9a Merge pull request #8140 from hashicorp/d-aws-sdk-1.4.1 
deps: github.com/aws/aws-sdk-go/... to v1.4.1
 2016-08-11 13:13:06 -04:00
James Nugent c38884912d deps: github.com/aws/aws-sdk-go/... to v1.4.1 2016-08-11 13:01:51 -04:00
James Nugent 21d1ac41fa Merge branch 'd-update-aws-sdk' 2016-08-11 12:52:35 -04:00
Martin Atkins 57c75dba7d Merge #8139: Remove some errant apostrophes in the docs 2016-08-11 09:37:59 -07:00
Michael Blakeley fd055b700d apostrophe police 2016-08-11 09:34:00 -07:00
Michael Blakeley 03bc37edcb apostrophe police 
Sorry, my OCD kicked in.

Use `it's` when you mean `it is`.
Use `its` when you mean something belongs to `it`.
 2016-08-11 09:32:54 -07:00
Noah Webb 1ff6f8ccf4 provider/google: Support Import of 'google_compute_target_pool' 2016-08-11 10:24:03 -04:00
Radek Simko 97fcd5f4cc Update CHANGELOG.md 2016-08-11 12:13:35 +01:00
Radek Simko 69f8a03ddd
aws/docs: Fix a few nitpicks after merging #7794 2016-08-11 12:11:15 +01:00
Paul Stack 78b4923f7d Update CHANGELOG.md 2016-08-11 20:59:31 +10:00
Guido Bakker ee9ebe849f Support setting datacenter when using consul remote state (#8102) 
* Support setting datacenter when using consul remote state

Change-Id: I8c03f4058e9373f0de8fde7ce291ec552321cc60

* Add documentation for setting datacenter when using consul remote state

Change-Id: Ia62feea7a910a76308f0a5e7f9505c9a210e0339
 2016-08-11 22:58:20 +12:00
Raphael Randschau 66a14cb3b7 provider/aws: Re-implement api gateway parameter handling (#7794) 
* provider/aws: Re-implement api gateway parameter handling

this PR cleans up some left overs from PR #4295, namely the parameter handling.

now that GH-2143 is finally closed this PR does away with the ugly
`request_parameters_in_json` and `response_parameters_in_json` hack.

* Add deprecation message and conflictsWith settings

following @radeksimko s advice, keeping the old code around with a deprecation
warning.

this should be cleaned up in a few releases

* provider/aws: fix missing append operation

* provider/aws: mark old parameters clearly as deprecated

* provider/aws work around #8104

following @radeksimko s lead

* provider/aws fix cnp error
 2016-08-11 11:49:58 +01:00
Peter McAtominey d7285d1b14 provider/azurerm: fix; add tests for importing traffic manager resources (#8111) 
* provider/azurerm: add test for importing traffic manager profile resource

TF_ACC=1 go test ./builtin/providers/azurerm -v -run TestAccAzureRMTrafficManagerProfile_import -timeout 120m
=== RUN   TestAccAzureRMTrafficManagerProfile_importBasic
--- PASS: TestAccAzureRMTrafficManagerProfile_importBasic (84.50s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/azurerm	84.722s

* provider/azurerm: fix; add test for importing traffic_manager_endpoint resource

TF_ACC=1 go test ./builtin/providers/azurerm -v -run TestAccAzureRMTrafficManagerEndpoint -timeout 120m
=== RUN   TestAccAzureRMTrafficManagerEndpoint_importBasic
--- PASS: TestAccAzureRMTrafficManagerEndpoint_importBasic (130.66s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_basic
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basic (152.87s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal (151.55s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_updateWeight
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updateWeight (199.33s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_updatePriority
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updatePriority (113.15s)
=== RUN   TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints
--- PASS: TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints (97.05s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/azurerm	844.740s
 2016-08-11 16:00:23 +12:00
Paul Stack 605dfada51 Update CHANGELOG.md 2016-08-11 15:20:06 +12:00
stack72 313ec1252c
Merge branch 'master' of github.com:hashicorp/terraform 2016-08-11 15:15:51 +12:00
stack72 c95bf296d4
Merge branch 'Ticketmaster-5637-conflict-resolution' 2016-08-11 15:15:34 +12:00
stack72 ec3e442f26
provider/aws: change the test to be us-west-2a 2016-08-11 15:15:23 +12:00
stack72 cdda4d76d4
Merge branch '5637-conflict-resolution' of https://github.com/Ticketmaster/terraform into Ticketmaster-5637-conflict-resolution 2016-08-11 11:23:04 +12:00
James Bardin a1a501a26a Merge pull request #8053 from hashicorp/jbardin/atlas-retry-policy 
don't retry the atlas requests with the wrong cert
 2016-08-10 17:09:00 -04:00
James Bardin ea2e875ea1 Merge pull request #8081 from hashicorp/jbardin/input-hcl 
Allow the HCL input when prompted
 2016-08-10 17:08:52 -04:00
Noah Webb b45650c390 provider/google: Support Import of 'google_compute_forwarding_rule' 2016-08-10 16:45:56 -04:00
Clint c9de6a4173 provider/aws: Change a few policy test docs to use heredoc format, to prevent regressions (#8118) 2016-08-10 15:34:38 -05:00
James Bardin c48a1423a1 Collapse nested if with an && 2016-08-10 16:34:21 -04:00
Kraig Amador 742089f10c Fixing the certs, test now passes 2016-08-10 13:31:36 -07:00
Noah Webb 3fb6287027 provider/google: Support Import of 'google_resource_http_health_check' 2016-08-10 16:30:41 -04:00
Noah Webb f55532b018 provider/google: Support Import of 'google_compute_autoscaler' 2016-08-10 16:19:31 -04:00
ldanz 8bba3d4e6e Documentation: explain the role of to_port in a security group rule when protocol is "icmp" (#8093) 2016-08-10 14:32:18 -05:00
James Bardin df0c795b39 Don't retry the atlas requests with the wrong cert 
This probably won't recover, so abort immediately.
Requires retryablehttp CheckRetry patch.
 2016-08-10 13:45:30 -04:00
James Bardin ee6159cd9d update github.com/hashicorp/go-retryablehttp 2016-08-10 13:45:29 -04:00
Clint 3fc119923e Revert "provider/aws: Added the ability to import aws_iam_role's" (#8112) 2016-08-10 11:18:03 -05:00
James Bardin d6c8b40201 unify some of the test code 
Have all the values in the testDiffFn go through the same code path
 2016-08-10 11:37:55 -04:00
James Bardin 2e5791ab2b Allow the HCL input when prompted 
We already accept HCL encoded input for -vars, and this expands that to
accept HCL when prompted for a value on the command line as well.
 2016-08-10 11:14:31 -04:00
Joe Topjian 5d9fa90005 Update CHANGELOG.md 2016-08-10 09:04:40 -06:00
Joe Topjian 38f0e62430 Merge pull request #8070 from fatmcgav/openstack_router_update_external_gw 
provider/openstack: Add support for updating the External GW assigned to a Neutron router
 2016-08-10 09:03:52 -06:00
Joe Topjian 59cab2f198 Merge pull request #8101 from GiovanniPaoloGibilisco/master 
provider/openstack: add acceptance test for Issue #8040
 2016-08-10 08:55:58 -06:00