Commit Graph

6333 Commits

Author SHA1 Message Date
Pablo Cantero 5930f22974 dynamodb-local Update AWS config
https://github.com/hashicorp/terraform/pull/2825#issuecomment-126353610

Tks @catsby
2015-07-30 12:21:03 -03:00
Pablo Cantero 28bef7c0c7 Merge branch 'master' into dynamodb-local 2015-07-30 12:16:07 -03:00
Dave Cunningham 65ba4c1b06 Make target_pools optional 2015-07-30 10:46:16 -04:00
Clint 9c8ae86db5 Update CHANGELOG.md 2015-07-30 09:29:19 -05:00
Clint 26b416335f Merge pull request #2861 from hashicorp/b-azure-instance-error
provider/azure: Provide a simpler error when using a Platform Image without a Storage Service
2015-07-30 09:28:33 -05:00
Clint Shryock 488587467c code formatting 2015-07-30 09:27:13 -05:00
Justin Campbell bbba052e8f Update CHANGELOG.md 2015-07-30 09:12:36 -04:00
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
Clint 593d83336c Merge pull request #2854 from berendt/vagrantfile_hostname
[Vagrantfile] set the hostname to 'terraform'
2015-07-29 15:39:19 -05:00
Justin Campbell 79e5c9d19b Merge pull request #2839 from hashicorp/gce-account-file-contents
providers/google: Change account_file to expect a JSON string
2015-07-29 16:02:30 -04:00
Justin Campbell 7884456c4b providers/google: Fix reading account_file path 2015-07-29 15:59:33 -04:00
Justin Campbell 4764a556c0 providers/google: Fix error appending 2015-07-29 15:59:33 -04:00
Clint Shryock 8faa111156 providers/google: Return if we could parse JSON 2015-07-29 15:59:32 -04: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 2a04708d66 providers/google: Default account_file* to empty
Prevents prompting for input
2015-07-29 15:59:32 -04:00
Justin Campbell a7ca7e0b36 providers/google: Add account_file/account_file_contents ConflictsWith 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
Justin Campbell 4ce776d252 providers/google: Use account_file_contents if provided 2015-07-29 15:59:32 -04:00
Justin Campbell a8d0a70c03 providers/google: Add account_file_contents to provider 2015-07-29 15:59:32 -04:00
Paul Hinze 9416d10ccc Update CHANGELOG.md 2015-07-29 14:48:04 -05:00
Paul Hinze 686598ebf5 Merge pull request #2878 from hashicorp/b-provider-warnings-crash
core: fix crash on provider warning
2015-07-29 14:46:12 -05:00
Clint 1f314444f4 Update CHANGELOG.md 2015-07-29 11:42:39 -05:00
Clint 1043fb7c88 Merge pull request #2842 from hashicorp/aws-elasticache-debug
provider/aws: Fix issue with checking for ElastiCache cluster status
2015-07-29 11:42:12 -05:00
Pablo Cantero 75492513ec dynamodb-local Use ` instead of : to refer region to keep the consistency with the
provider docs
2015-07-29 13:36:02 -03:00
Pablo Cantero 2f6d20837f dynamodb-local Update aws provider docs to include the `dynamodb_endpoint` argument 2015-07-29 13:33:51 -03:00
Clint Shryock d3b93d54fb use d.Id() 2015-07-29 11:13:19 -05:00
Clint Shryock 0aafacf3c3 Merge branch 'master' into aws-elasticache-debug
* master: (33 commits)
  Update CHANGELOG.md
  Update CHANGELOG.md
  scripts: change website_push to push from HEAD
  update analytics
  provider/aws: Update source to comply with upstream breaking change
  Update CHANGELOG.
  provider/aws: Fix issue with IAM Server Certificates and Chains
  Increase timeout, IGM delete can be slow
  Make failure of "basic" test not interfere with success of "update" test
  Update CHANGELOG.md
  Use new autoscaler / instance group manager APIs.
  Compute private ip addresses of ENIs if they are not specified
  Update CHANGELOG.md
  Update CHANGELOG.md
  provider/aws: Error when unable to find a Root Block Device name
  Update CHANGELOG.md
  aws_db_instance: Add mixed-case engine test to ensure StateFunc works.
  aws_db_instance: Only write lowercase engines to the state file.
  Update CHANGELOG.md
  Split AWS provider topics by service.
  ...
2015-07-29 11:07:01 -05: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
Clint 3b8df13142 Merge pull request #2816 from TimeIncOSS/f-aws-elb-name-test
provider/aws: Add acceptance test for ELB w/out name
2015-07-29 10:50:49 -05:00
Clint 2e787cffc9 Merge pull request #2798 from hashicorp/releasing-update
updates for RELEASING
2015-07-29 10:42:23 -05:00
Clint 6bfd1db8d4 Update CHANGELOG.md 2015-07-29 09:38:31 -05:00
Clint 6339e18f14 Merge pull request #2871 from hashicorp/b-aws-server-sert-fixes
provider/aws: Fix issue with IAM Server Certificates and Chains
2015-07-29 09:37:51 -05:00
Paul Hinze eda2c935d9 Update CHANGELOG.md 2015-07-29 09:34:59 -05:00
Paul Hinze efaf63969c Merge pull request #2777 from dwradcliffe/dnsimple_force_new
provider/dnsimple: domain and type should force new records
2015-07-29 09:34:24 -05:00
Paul Hinze 3080c827d8 scripts: change website_push to push from HEAD
so it works properly on release branches
2015-07-28 18:38:59 -05:00
Kevin Fishner d780524385 update analytics 2015-07-28 16:09:31 -07:00
Paul Hinze 5ebbda3334 core: fix crash on provider warning
When a provider validation only returns a warning, we were cutting the
evaltree short by returning an error. This is fine during a
`walkValidate` but was causing trouble during `walkPlan` and
`walkApply`.

fixes #2870
2015-07-28 17:13:14 -05:00
Clint 7de7a406f3 Merge pull request #2874 from hashicorp/b-aws-upstream-fixes
provider/aws: Update source to comply with upstream breaking change
2015-07-28 15:59:16 -05:00
Clint Shryock 579ccbefea provider/aws: Update source to comply with upstream breaking change 2015-07-28 15:29:46 -05:00
Dave Cunningham 8031d60ced Update CHANGELOG. 2015-07-28 16:01:04 -04:00
Dave Cunningham 4fa68716c2 Merge pull request #2868 from sparkprime/gce_autoscaling
Gce autoscaling
2015-07-28 15:59:29 -04:00
Clint Shryock 8527174c6e provider/aws: Fix issue with IAM Server Certificates and Chains 2015-07-28 14:02:26 -05:00
Dave Cunningham e8e5495483 Increase timeout, IGM delete can be slow 2015-07-28 14:09:43 -04:00
Dave Cunningham 24167b1085 Make failure of "basic" test not interfere with success of "update" test 2015-07-28 14:09:29 -04:00
Clint 476197f2cf Update CHANGELOG.md 2015-07-28 12:58:10 -05:00
Clint 86dd6b231b Merge pull request #2743 from jszwedko/compute-eni-private-ips
Compute private ip addresses of ENIs if they are not specified
2015-07-28 12:57:10 -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
Jesse Szwedko affa09efdd Compute private ip addresses of ENIs if they are not specified
As AWS will assign the ENI an address
2015-07-27 23:24:49 +00:00
Christian Berendt 9a7e6618cb provider/openstack: not only SATA or SSD are valid volume types
The available volume types depend on the used OpenStack environment.

Closes-bug: #2864
2015-07-28 00:33:43 +02:00