Commit Graph

9231 Commits

Author SHA1 Message Date
James Nugent 35c21cb808 Merge branch 'docker-extra-hosts' of https://github.com/paulbellamy/terraform into paulbellamy-docker-extra-hosts 2016-01-14 15:48:51 +00:00
James Nugent ace215481a provider/aws: Add profile to provider config
This allows specification of the profile for the shared credentials
provider for AWS to be specified in Terraform configuration. This is
useful if defining providers with aliases, or if you don't want to set
environment variables. Example:

$ aws configure --profile this_is_dog
... enter keys

$ cat main.tf
provider "aws" {
    profile = "this_is_dog"

    # Optionally also specify the path to the credentials file
    shared_credentials_file = "/tmp/credentials"
}

This is equivalent to specifying AWS_PROFILE or
AWS_SHARED_CREDENTIALS_FILE in the environment.
2016-01-14 15:39:35 +00:00
James Nugent ea4595840c Merge pull request #4674 from stack72/carl-youngblood/master
Fix recurrence on `aws_autoscaling_schedule` resource
2016-01-14 12:22:43 +00:00
Carl Youngblood 5c68858c5b Bug fixes for aws_autoscaling_schedule resource
- Fix typo s/recurrance/recurrence
- Fix missing nil check on EndTime that was crashing
2016-01-14 10:08:37 +00:00
James Nugent e94ee6b77c Update CHANGELOG.md 2016-01-14 09:14:12 +00:00
James Nugent 65b071d1af provider/docker: Fix flaky integration tests
Asserting on the value of `latest` on an image is prone to failing
because of new images being pushed upstream. Instead of asserting on a
hash, we assert that the value matches a regular expression for the
format of an image hash.
2016-01-14 09:12:05 +00:00
James Nugent ee7553f076 Merge branch 'docker_network' of https://github.com/ColinHebert/terraform into ColinHebert-docker_network 2016-01-14 07:01:03 +00:00
James Nugent eb9f77b91d Update CHANGELOG.md 2016-01-14 06:52:11 +00:00
James Nugent ea9e01cc78 Merge pull request #4669 from lwander/f-gcp-sql-user
provider/google: SQL user resource, documentation & tests
2016-01-14 06:51:17 +00:00
clint shryock 8181a4ea24 minor clean ups after #3862 2016-01-13 16:58:07 -06:00
Clint 9ace240a58 Update CHANGELOG.md 2016-01-13 16:57:04 -06:00
Clint 7f6624e926 Merge pull request #3862 from stack72/aws-redshift
provider/aws: AWS Redshift
2016-01-13 16:52:47 -06:00
Lars Wander c93c8aca43 Update CHANGELOG.md 2016-01-13 17:15:37 -05:00
Lars Wander 7245a63077 Merge pull request #3893 from lwander/b-gcp-bucket-content
provider/google: Content field for bucket objects
2016-01-13 17:14:53 -05:00
Lars Wander 682d3a28cf Update CHANGELOG.md 2016-01-13 17:14:29 -05:00
Lars Wander 504bc87ec6 Merge pull request #4265 from lwander/gcp-assigned-nat-ip
provider/google: provide assigned_nat_ip as well as nat_ip
2016-01-13 17:13:16 -05:00
Lars Wander b8c66dc5e5 provider/google: Content field for bucket objects 2016-01-13 17:06:58 -05:00
Clint 6b2fba67bb Merge pull request #4642 from hashicorp/pr-4626
Changes AMI to be non-hvm, matching the one used in earlier pages
2016-01-13 15:48:00 -06:00
Lars Wander 456ec4d151 provider/google: SQL user resource, documentation & tests 2016-01-13 16:33:08 -05:00
Clint c55c7f88e6 Update CHANGELOG.md 2016-01-13 15:31:27 -06:00
Clint 64f44c53c6 Merge pull request #4597 from tpounds/support-aws-elb-az-and-subnet-updates
provider/aws: Support updating ELB availability zones and subnets
2016-01-13 15:30:44 -06:00
Clint 6faa983a1a Update CHANGELOG.md 2016-01-13 15:16:05 -06:00
Clint eed2a2a0f6 Merge pull request #3139 from koendc/b-rds-snapshots-required-fields
provider/aws: aws_db_instance: make some fields optional
2016-01-13 15:15:09 -06:00
Clint 176a99348a Update CHANGELOG.md 2016-01-13 13:40:24 -06:00
Clint 921f6eb806 Merge pull request #4388 from jszwedko/add-support-for-aws-directory-service-microsoft-active-directory
Add support for creating Managed Microsoft Active Directory and Directory Connectors in AWS
2016-01-13 13:39:29 -06:00
Paul Hinze 395b61825d Merge pull request #4654 from hashicorp/gofmts
Go fmt updates
2016-01-13 12:55:36 -06:00
Clint fcfe9ac805 Update CHANGELOG.md 2016-01-13 11:58:19 -06:00
Clint c9231a73ec Merge pull request #4240 from hashicorp/b-aws-catch-sg-name-id-error
provider/aws: Trap Instance error from mismatched SG IDs and Names
2016-01-13 11:57:58 -06:00
Clint 3937d20c03 Merge pull request #4666 from hashicorp/pr-4184
provider/aws: Implement some lacking parameters and stop waiting when in vpc and un-use opsworks default SG (continues #4184)
2016-01-13 11:24:21 -06:00
clint shryock f084871fad move the 'color' assignment 2016-01-13 11:16:36 -06:00
clint shryock aa7ba9ab9b provider/aws: OpsWorks updates
- add UseOpsworksSecurityGroups to the Create ops
- toggle waiting on said membership of groups
2016-01-13 11:13:09 -06:00
aibou 5e9c17d008 Implement some lacking parameters and stop waiting when in vpc and un-use opsworks default SG 2016-01-13 10:45:32 -06:00
Clint fc69ed974e Update CHANGELOG.md 2016-01-13 10:24:50 -06:00
Clint fa03c5460b Merge pull request #4664 from hashicorp/f-aws-lambda-alias
provider/aws: AWS Lambda Alias (continues #4161)
2016-01-13 10:23:25 -06:00
clint shryock 73064bcb87 formatting 2016-01-13 10:10:15 -06:00
Johannes Boyne df7ac2d51b Add AWS lambda alias support and documentation 2016-01-13 10:05:32 -06:00
Jason Riddle 5cb4b70e7e Add ENV['no_proxy'] to chef provisioner 2016-01-13 09:51:08 -05:00
Clint aa05e8262a Merge pull request #4660 from sfilipov/patch-1
Split long comment to two lines
2016-01-13 08:48:56 -06:00
Simeon Filipov 2962cff199 Split long comment to two lines
The comment on first line of the code example is 82 characters long
and is cut on the 80-th character when viewed online. The second line
contains only two letters "on" without # in front.

The comment is displayed on two lines anyway, it is better if it is split to
two lines of less than 80 characters.
2016-01-13 14:46:06 +00:00
Koen De Causmaecker 45ef11e59f provider/aws: aws_db_instance: unrequire fields
When spinning up from a snapshot or a read replica, these fields are
now optional:
* allocated_storage
* engine
* password
* username

Some validation logic is added to make these fields required when
starting a database from scratch.
The documentation is updated accordingly.
2016-01-13 15:40:15 +01:00
James Nugent 97de7e637e Merge pull request #4621 from jkinred/master
Specify an example url for vCloud Director provider
2016-01-13 13:22:41 +00:00
James Nugent f3e58fdff5 Merge pull request #4640 from johnwards/patch-1
Fix auto scaling example to use ID rather than name
2016-01-13 13:14:00 +00:00
James Nugent 0d2f4ac3ba Merge pull request #4658 from lusis/artifactory-documentation-fix
making note of artifactory env vars that are supported
2016-01-13 13:12:08 +00:00
John E. Vincent 0e664c8c20 making note of artifactory env vars that are supported 2016-01-13 07:48:50 -05:00
Joe Topjian c403e9fc6f Update CHANGELOG.md 2016-01-12 22:06:00 -07:00
Joe Topjian 7b4e17708a Merge pull request #4623 from jtopjian/openstack-instance-personality
provider/openstack: Add Instance Personality
2016-01-12 22:04:14 -07:00
Clint e7d20c2eb0 Update CHANGELOG.md 2016-01-12 17:03:28 -06:00
Clint 5c3b88a0a7 Merge pull request #4140 from hashicorp/b-empty-element-sg
provider/aws: error with empty list item on security group
2016-01-12 17:03:02 -06:00
clint shryock 57b9097015 provider/aws: Default false for VPC Classic Link 2016-01-12 16:49:51 -06:00
Clint 3d866f71ea Update CHANGELOG.md 2016-01-12 16:48:56 -06:00