69ef012dfc
Merge pull request #1632 from hashicorp/f-generate-sg-names
...
unique identifier helper for resources / generate AWS security group names
2015-04-23 07:25:23 -05:00
6bb8947d16
providers/aws: aws_elb incr. idle_timeout to 60s
...
per docs
http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/config-idle-timeout.html
2015-04-23 12:46:52 +03:00
6401635b97
providers/aws: network_acl, remove blank filter
...
The upstream behavior here changed, and the request needs a `nil`
instead of an empty slice to indicate that we _don't_ want to filter on
Network ACL IDs.
fixes #1634
2015-04-22 14:44:31 -05:00
6b5138328f
changing route53_zone.name_servers back to list
2015-04-22 13:27:20 -05:00
079856620a
provider/aws: set default SG description
...
because requiring a SG description is annoying
2015-04-22 13:27:20 -05:00
33de319293
provider/aws: allow SG names to be generated
2015-04-22 12:56:06 -05:00
94f703692c
provider/aws: switch to helper for LC names
2015-04-22 12:53:47 -05:00
c1464b1c6d
Merge pull request #1623 from hashicorp/b-private-ip-ssh
...
providers/aws: if no public IP, use private IP for SSH by default
2015-04-22 16:02:04 +02:00
341b2ff864
Merge pull request #1625 from hashicorp/b-panic-network-acl
...
provider/aws: fix potential panic when finding network ACL
2015-04-22 16:01:57 +02:00
f77f77f9f8
provider/aws: fix potential panic when finding network ACL
2015-04-22 12:39:01 +02:00
19b3fa1a76
provider/aws: allow int for network acl entry [GH-1435]
2015-04-22 12:35:23 +02:00
ec38a65dda
providers/aws: if no public IP, use private IP for SSH by default
2015-04-22 12:25:28 +02:00
8ca42f832e
Merge pull request #1525 from Banno/route53-zone-nameservers
...
providers/aws: Expose Route53 zone nameservers for parent zone NS record
2015-04-22 12:10:27 +02:00
9037a3a4bc
Merge pull request #1426 from dainis/master
...
provider/google: add additional options to google provider
2015-04-22 08:50:22 +02:00
d02abb7a8c
Merge pull request #1484 from sparkprime/deprecate-network
...
deprecate google instance 'network' attribute in favor of network_interface
2015-04-22 08:49:04 +02:00
11e6e89f73
provider/aws: make tests public and run them
2015-04-22 08:44:24 +02:00
78f9fb164b
provider/aws: fix compilation errors
2015-04-22 08:42:44 +02:00
887f1b3d12
Merge branch 'elb-connection-settings' of https://github.com/jwaldrip/terraform into jwaldrip-elb-connection-settings
2015-04-22 08:38:19 +02:00
70a0579a12
Merge pull request #1578 from TimeIncOSS/route53-weighted-records
...
provider/aws: Add support for weighted Route53 records
2015-04-22 08:33:28 +02:00
2cecd586c2
Merge pull request #1619 from jgjay/elb-listener-update
...
provider/aws: handle changes to elb listeners after creation
2015-04-22 08:24:36 +02:00
b755459ee3
Merge pull request #1358 from rzh/placement_group
...
provider/aws: support for AWS Placement Group
2015-04-22 08:20:43 +02:00
55f2a3659f
Merge pull request #1550 from ggiamarchi/openstack/lb_vip_floatingip
...
Floating IP support for LBaaS Virtual IP
2015-04-22 08:17:50 +02:00
2996a25ce0
Merge pull request #1597 from aocsolutions/fix_sg_refresh
...
provider/aws: more careful with pointers
2015-04-22 08:12:43 +02:00
3176e5b44a
Merge pull request #1595 from TimeIncOSS/aws-account-protection
...
aws: Allow defining blacklist/whitelist of account IDs
2015-04-22 08:08:01 +02:00
81079bb6ac
handle addition/update/removal of listeners after creation
2015-04-21 23:17:17 +01:00
0c5011bea4
provider/aws: Fix issue with empty IPRanges
2015-04-21 10:57:50 -05:00
c8a8f05935
Merge pull request #1601 from bitglue/sts_token
...
provider/aws: support session token in AWS credentials
2015-04-20 15:01:29 -07:00
21b0a03d70
Support for multiple providers of the same type
...
Adds an "alias" field to the provider which allows creating multiple instances
of a provider under different names. This provides support for configurations
such as multiple AWS providers for different regions. In each resource, the
provider can be set with the "provider" field.
(thanks to Cisco Cloud for their support)
2015-04-20 14:14:34 -07:00
d55c8d8404
provider/docker: fmt on container resource
2015-04-20 14:18:46 -05:00
d4c8c528e0
Support session token in AWS credentials
...
Session tokens are necessary to utilize temporary credentials.
http://docs.aws.amazon.com/STS/latest/UsingSTS/Welcome.html
2015-04-20 15:09:04 -04:00
3ded884d95
provider/docker: guard against nil NetworkSettings
2015-04-20 12:42:36 -05:00
c2319da1aa
Add docker container network settings to output attribute
2015-04-20 12:41:35 -05:00
ccd14a6fcc
Merge pull request #1588 from hashicorp/b-par-prov
...
helper/ssh: add random number to upload path for script [GH-1545]
2015-04-20 10:22:33 -07:00
6da242de03
fixing sg refresh
2015-04-20 11:27:58 -04:00
150fd00932
AWS account ID protection added
2015-04-20 12:07:39 +01:00
1c0f2f136c
provider/aws: fix vet error, missing fmt param
2015-04-19 18:13:04 -07:00
dda4ae6d12
Merge pull request #1555 from fatih/fix-eip-panic
...
providers/aws: check allocationId only if it's vpc, fixes #1345
2015-04-19 18:10:31 -07:00
2acc9b2e44
Merge pull request #1564 from nickryand/docker_links
...
Added Docker links support to the docker_container resource.
2015-04-18 16:41:17 -07:00
283a3af693
Merge pull request #1576 from bitglue/s3_refresh
...
provider/aws: refresh state for deleted s3 bucket correctly
2015-04-18 16:40:12 -07:00
de8666a5fa
helper/ssh: add random number to script [GH-1545]
2015-04-18 16:09:08 -07:00
009514f0d3
Allow using deprecated security_groups in NI spec
2015-04-17 21:26:17 +01:00
eda987dcfb
provider/aws: Fix issue when creating ELB with no tags
2015-04-17 14:00:27 -05:00
555f9dfab3
aws: Support for weighted Route53 records added
...
- closes #1155
2015-04-17 18:53:36 +01:00
47e1ec85f1
Refresh state for deleted s3 bucket correctly
...
If reading an S3 bucket's state, and that bucket has been deleted, don't
fail with a 404 error. Instead, update the state to reflect that the
bucket does not exist. Fixes #1574 .
2015-04-17 13:30:31 -04:00
c3f9c12426
Merge remote-tracking branch 'refs/remotes/origin/master' into route53-zone-nameservers
2015-04-17 10:11:53 -05:00
0d1540d448
Merge pull request #1565 from hashicorp/f-aws-upstream-cleanup
...
F aws upstream cleanup
2015-04-17 08:55:11 -05:00
3f66e480cc
provisioner/file: expand ~ in source
...
closes #1559
tested manually, since a unit test would be sort of annoying to write.
:)
2015-04-16 18:53:04 -05:00
a6325ad18c
Merge pull request #1547 from sparkprime/user-agent
...
Add a UserAgent with version temporarily set to 0.0.0
2015-04-16 16:57:10 -05:00
d27a41746c
clean up tags sdk lib
2015-04-16 15:31:40 -05:00
3e6822ce08
more cleans ups of SDK reference
2015-04-16 15:28:18 -05:00
79fc8223bb
consolidate structure.go
2015-04-16 15:18:01 -05:00
ba43b7c963
mass search-replace of ec2SDKconn
2015-04-16 15:05:55 -05:00
331f6705b8
providers/aws: cleanup of connections, upgrades network acl test
2015-04-16 15:02:04 -05:00
f74405d5e7
Added Docker links support to the docker_container resource.
2015-04-16 12:42:21 -07:00
c59bfd0ca5
Merge branch 'f-aws-upstream-s3'
...
* f-aws-upstream-s3:
provider/aws: Conver AWS S3 to upstream sdk
2015-04-16 13:51:12 -05:00
1da9bc8f4c
fix go formatting after rebase
2015-04-16 13:42:16 -05:00
1545dbb803
provider/aws: Convert Route 53 Zone, Record to upstream
2015-04-16 13:41:38 -05:00
a5b2437dcf
provider/aws: Convert Instance to use upstream library
2015-04-16 12:01:10 -05:00
86810789c2
providers/aws: check allocationId only if it's vpc, fixes #1345
...
EIP with VPC only returns an allocationID. However, for standard we need
to lookup for PublicIP. When we use an example for standard EC2 instance
(here `t1.micro`):
```
resource "aws_instance" "example" {
ami = "ami-25773a24"
instance_type = "t1.micro"
}
resource "aws_eip" "ip" {
instance = "${aws_instance.example.id}"
}
```
then in this case, allocationID will be nil, but publicIP will be non
nil (which is used later for association the IP). So check for
allocationId only if it's of domain `VPC`.
2015-04-16 16:08:52 +03:00
7a99dd48b2
provider/aws: Convert Launch Configuration over to upstream
...
- removes extra ASG connection
2015-04-16 07:10:17 -05:00
d855047af3
Floating IP support for LBaaS Virtual IP
2015-04-16 02:51:05 +02:00
e0905d89f8
Add a UserAgent with version temporarily set to 0.0.0
2015-04-15 18:17:21 -04:00
f8b05fa05e
using a set for route53 name_servers
2015-04-15 16:10:02 -05:00
46d3ab5ccd
rename delegation_set_name_servers to name_servers
2015-04-15 16:07:50 -05:00
210b380d01
go vet updates
2015-04-15 15:32:20 -05:00
723be13f96
go fmt asg things
2015-04-15 15:30:35 -05:00
1f7d0944f1
provider/aws: Convert AWS ASG to upstream aws-sdk-go
2015-04-15 15:29:59 -05:00
e97fd27b14
Merge pull request #1539 from hashicorp/f-aws-instance-vpc-sec-ids
...
provider/aws: Add support for separate VPC Security Group IDs attribute
2015-04-15 15:25:03 -05:00
334b157a5c
Merge pull request #1510 from hashicorp/f-aws-upstream-rds-instance
...
provider/aws: Convert AWS RDS to use upstream aws-sdk-go
2015-04-15 15:23:52 -05:00
1ed2219493
don't capitalize IAM
2015-04-15 15:05:44 -05:00
9053cc3d18
Merge pull request #1537 from ggiamarchi/openstack/insecure_https
...
OpenStack - Allow to disable HTTPS certificate check
2015-04-15 15:03:26 -05:00
df45b2cda8
go fmt db things
2015-04-15 15:02:52 -05:00
b87c05e5a8
Allow to disable HTTPS certificate check
2015-04-15 21:54:44 +02:00
470379e7ed
connection naming cleanups
2015-04-15 14:36:08 -05:00
9187cab6ac
provider/aws: Convert remaining RDS resources to use upstream library
2015-04-15 14:31:53 -05:00
d579b4b75c
provider/aws: Convert AWS RDS to use upstream aws-sdk-go
2015-04-15 14:28:02 -05:00
220f62eb72
Merge pull request #1532 from hashicorp/f-aws-upstream-elb
...
providers/aws: Conver AWS ELB to upstream
2015-04-15 14:16:24 -05:00
5a815efdbb
Merge pull request #1531 from hashicorp/f-aws-upstream-vpn-gateway
...
provider/aws: Convert VPN Gateway to upstream
2015-04-15 14:15:03 -05:00
f948b6205a
Merge pull request #1522 from hashicorp/f-aws-upstream-vpc-peering
...
provider/aws: Convert AWS VPC Peering to upstream
2015-04-15 14:14:02 -05:00
3337503eda
update test and documentation for vpc ids in instances
2015-04-15 12:17:21 -05:00
97b98b1da6
Merge branch 'master' into f-aws-instance-vpc-sec-ids
...
* master: (511 commits)
Update CHANGELOG.md
core: avoid diff mismatch on NewRemoved fields during -/+
Update CHANGELOG.md
update CHANGELOG
Fix minor error in index/count docs
terraform: remove debug
terraform: when pruning destroy, only match exact nodes, or exact counts
up version for dev
update CHANGELOG
terraform: prune tainted destroys if no tainted in state [GH-1475]
update CHANGELOG
config/lang: support math on variables through implicits
update CHANGELOG
update cHANGELOG
update cHANGELOG
providers/aws: set id outside if/esle
providers/aws: set ID after creation
core: remove dead code from pre-deposed refactor
website: update LC docs to note name is optional
security_groups field expects a list of Security Group Group Names, not IDs
...
2015-04-15 12:12:17 -05:00
76701884cd
Merge pull request #1517 from hashicorp/f-simplify-google-instance
...
google: simplify instance metadata schema
2015-04-15 11:48:37 -05:00
01e75e0fc3
google: simplify instance metadata schema
...
It doesn't need to be a List of Maps, it can just be a Map.
We're also safe to remove a previous workaround I stuck in there.
The config parsing is equivalent between a list of maps and a plain map,
so we just need a state migration to make this backwards compatible.
2015-04-15 11:01:35 -05:00
dc54d6a852
refactor out a refresh fun that wasn't really used
2015-04-15 10:26:39 -05:00
a3ffb6ea6e
fix test failure
2015-04-15 09:43:43 -05:00
7078753733
Merge branch 'master' into f-aws-upstream-elb
...
* master:
Update CHANGELOG.md
core: avoid diff mismatch on NewRemoved fields during -/+
2015-04-15 09:34:28 -05:00
6365b3af89
Merge pull request #1515 from hashicorp/b-diff-mismatch-on-instance-replacement
...
core: avoid diff mismatch on NewRemoved fields during -/+
2015-04-14 17:44:28 -05:00
64f0897c82
core: avoid diff mismatch on NewRemoved fields during -/+
...
fixes #1508
In a DESTROY/CREATE scenario, the plan diff will be run against the
state of the old instance, while the apply diff will be run against an
empty state (because the state is cleared when the destroy node does its
thing.)
For complex attributes, this can result in keys that seem to disappear
between the two diffs, when in reality everything is working just fine.
Same() needs to take into account this scenario by analyzing NewRemoved
and treating as "Same" a diff that does indeed have that key removed.
2015-04-14 17:23:30 -05:00
b763294926
fixing string format
2015-04-14 16:51:58 -05:00
4186ec18c6
providers/aws: Conver AWS ELB to upstream
2015-04-14 16:41:36 -05:00
900dd4e151
provider/aws: Convert VPN Gateway to upstream
2015-04-14 15:45:48 -05:00
eb43822f68
err-check the resource set
2015-04-14 14:54:38 -05:00
8f1acaf026
expose Route53 zone name servers
2015-04-14 14:17:01 -05:00
95026b6266
provider/aws: Convert AWS VPC Peering to upstream
2015-04-14 11:23:26 -05:00
d4e7c2dedc
provider/aws: Conver AWS S3 to upstream sdk
2015-04-14 11:07:05 -05:00
710d1113eb
Merge pull request #1490 from jtopjian/openstack-allow-blank-region
...
provider/openstack: Allow Blank Region
2015-04-14 08:28:03 -07:00
0eb69bcd37
Merge pull request #1518 from hashicorp/b-lc-id
...
providers/aws: set LC ID after creation
2015-04-14 08:23:31 -07:00
783d912b7c
providers/aws: set id outside if/esle
2015-04-14 08:23:16 -07:00
0eecf070d9
Merge pull request #1489 from hashicorp/f-aws-upstream-route-table
...
provider/aws: Convert Route table and Route table association to upstream aws-sdk-go
2015-04-14 10:15:24 -05:00
85c4a134ad
Merge pull request #1486 from hashicorp/f-aws-upstream-vpc
...
provider/aws: Convert AWS VPC to upstream aws-sdk-go
2015-04-14 10:14:56 -05:00
Paul Hinze