Commit Graph

582 Commits

Author SHA1 Message Date
Armon Dadgar 633a08230e Merge pull request #638 from snehaso/tag_for_acl
[AWS] added tags for aws_network_acl
2014-12-10 12:59:22 -08:00
Armon Dadgar 9668c8292f Merge pull request #637 from snehaso/vpc_tenanct
[AWS] added vpc instance_tenancy
2014-12-10 12:58:50 -08:00
Armon Dadgar 8e32076d55 Merge pull request #635 from snehaso/cross_zone_lb
[AWS]  enabled cross zone load balancing
2014-12-10 10:55:54 -08:00
Sneha Somwanshi 5e3e8562fc added tags for aws_network_acl 2014-12-10 16:29:00 +05:30
Sneha Somwanshi 89f1a38f5b added vpc tenancy argument 2014-12-10 16:10:00 +05:30
Sneha Somwanshi 1d3e30b353 enabled cross zone load balancing 2014-12-10 12:49:43 +05:30
Armon Dadgar 82e60bb3cd Merge pull request #631 from snehaso/network_acl
aws_network_acl: return error if rule protocol is invalid
2014-12-09 09:07:44 -08:00
Sneha Somwanshi aad594aed3 aws_network_acl: return error if protocol is invalid 2014-12-08 16:53:05 +05:30
Armon Dadgar 38697d6b4c aws: Making security group ingress rules optional 2014-12-07 23:52:04 -08:00
Armon Dadgar fae29f4685 Merge pull request #506 from muralimadhu/master
Support termination policies in aws auto scaling group
2014-12-07 23:35:33 -08:00
Armon Dadgar 03d4a425b6 Merge pull request #623 from snehaso/network_acl
[AWS] added new resource aws_network_acl
2014-12-07 23:09:51 -08:00
Sneha Somwanshi 4b154b8fe7 Fixed update of ingress/egress rules 2014-12-08 11:00:55 +05:30
Armon Dadgar 7182e5618e Merge pull request #612 from MerlinDMC/feature/aws_block_device_virtual_name
allow setting the block device virtual_name
2014-12-03 12:08:07 -08:00
Armon Dadgar a2c8859f04 Merge pull request #615 from Banno/fix-aws-instance-block-devices-index-range
fixing array length for aws instance volumes
2014-12-03 12:00:31 -08:00
Armon Dadgar f7a0b7ac1d Merge pull request #617 from josephholsten/simplify-do-droplet-image-loading
simplify digitalocean_droplet.image loading
2014-12-03 11:59:52 -08:00
Sneha Somwanshi c79e6ba08b handled subnet and network acl association 2014-12-03 16:37:50 +05:30
Sneha Somwanshi 86aafdb839 test for tenancy schema 2014-12-03 15:58:51 +05:30
Joseph Anthony Pasquale Holsten 5b0894b5cd simplify digitalocean_droplet.image loading
If a droplet's image slug is empty and its image id is empty, then the
image attribute should be empty, so we may assign from either. So it is
unnecessary to check if the image id is empty.

* remove unnecessary check for emptiness of image id
* reverse order of the conditions for assigning the image attribute,
  with the default case (using the slug) first, and the fallback case
  (using the id) second
2014-12-01 11:36:05 -08:00
Sneha Somwanshi cd0f9761da rearranged the tests 2014-12-01 14:19:39 +05:30
Luke Amdor f3ff4bece8 fixing array length for aws instance volumes 2014-11-30 08:24:23 -06:00
Sneha Somwanshi 5eec8a531c Added CRUD operations for network acl 2014-11-30 17:10:54 +05:30
Sneha Somwanshi d4a887278e flatten/expand operations for network_acl 2014-11-30 17:09:37 +05:30
Sneha Somwanshi bd9e9ec0c4 Add support for network acls 2014-11-26 19:14:02 +05:30
Sneha Somwanshi dca2d9aa4c acceptance test for creating network acl 2014-11-26 19:12:59 +05:30
Sneha Somwanshi cebea04cce added provider for aws_network_acl 2014-11-26 19:12:39 +05:30
Sneha Somwanshi f63e032c23 Merge remote-tracking branch 'upstream/master' 2014-11-26 17:06:42 +05:30
Armon Dadgar ccf7f40711 Merge pull request #596 from svanharmelen/f-refactor-aws-provider
provider/aws: refactor to use the schema.Provider approach
2014-11-24 16:30:41 -08:00
Sander van Harmelen d3e1a6678d Making some last tweaks and fixing some acc tests 2014-11-24 21:22:18 +01:00
Seth Vargo eb729d17c7 Merge pull request #546 from tmtk75/dev/enable-associate-public-ip
support associate_public_ip_address for aws_launch_configuration
2014-11-24 09:58:26 -05:00
Sander van Harmelen 0725486e89 Refactored the last two resources 2014-11-24 14:04:48 +01:00
Tomotaka Sakuma db8256a4a7 add associate_public_ip_address attr to the acceptance test of aws_launch_configuration 2014-11-24 13:27:41 +09:00
Daniel Malon 1e3065ae11 allow setting the block device virtual_name 2014-11-22 09:50:22 +00:00
Sander van Harmelen eccd5ad308 Refactored about 90%
Still need to update 2 resources and check the acceptance tests, but
overall we’re nearly there 😃
2014-11-21 17:58:34 +01:00
Madhu 23c3280c1d { 2014-11-20 14:18:14 -08:00
Madhu a987ce3db0 so my fix works 2014-11-20 14:16:24 -08:00
Seth Vargo d7a9b663b4 Merge pull request #585 from fdr/routes-optional
Make Routes in RouteTable optional
2014-11-20 11:19:15 -05:00
Seth Vargo b7de15f8b9 Merge pull request #586 from svanharmelen/f-update-google-provider
Fix acc tests and updated the provider schema to use a DefaultFunc
2014-11-20 11:17:01 -05:00
Sander van Harmelen 6be4b2e807 A really small update fixing a cosmetic inconsistentie
For the OCD types among us, this inconsistentie (only location where
droplet is spelled with a capital) drives me mad
😝
2014-11-20 15:09:22 +01:00
Sander van Harmelen 36ed95c86d Fixing the acc tests
I do wonder when these tests where last run successfully… Must be quite
some time ago considering what I needed to fix in here 😉
2014-11-20 14:30:02 +01:00
Sander van Harmelen bed36cc86a Refactoring the resourceInstanceTags func just a little
My eye caught this somewhat un-logic mixed use of ‘vs’ and
‘v.(*schema.Set)’, so thought to make it a little cleaner…
2014-11-20 11:32:15 +01:00
Sander van Harmelen 144ceb8003 providers/google: update schema to use a DefaultFunc
This makes testing easier and gives you a way to configure the provider
using env variables. It also makes the provider more inline following
the TF 0.2 approach.
2014-11-20 11:25:23 +01:00
Daniel Farina 67b03247ec Make Routes in RouteTable optional
Otherwise it is impossible to get simple configurations with the
"default" routing table, which is only the "local" route.

The following contents of main.tf expose the bug, and boots an instance
fine after this patch is applied:

    variable aws_access_key {}
    variable aws_secret_key {}
    variable aws_ubuntu_ami {}

    provider "aws" {
        access_key = "${var.aws_access_key}"
        secret_key = "${var.aws_secret_key}"
        region = "us-east-1"
    }

    resource "aws_vpc" "default" {
        cidr_block = "10.0.0.0/20"
    }

    resource "aws_route_table" "private" {
        vpc_id = "${aws_vpc.default.id}"
        # Note the lack of "route" sub-key here.
    }

    resource "aws_subnet" "private" {
        vpc_id = "${aws_vpc.default.id}"
        cidr_block = "10.0.1.0/24"
    }

    resource "aws_route_table_association" "private" {
        subnet_id = "${aws_subnet.private.id}"
        route_table_id = "${aws_route_table.private.id}"
    }

    # Demonstrate an instance can be booted fine in this fashion.
    resource "aws_instance" "sample" {
        ami = "${var.aws_ubuntu_ami}"
        instance_type = "t2.micro"
        subnet_id = "${aws_subnet.private.id}"
    }

terraform.tfvars for completeness:

    aws_access_key = "..."
    aws_secret_key = "..."

    # A public Trusty AMI
    aws_ubuntu_ami = "ami-9aaa1cf2"
2014-11-19 22:04:44 -08:00
Armon Dadgar e53bf23c0c provider/aws: Fixing merge conflict 2014-11-19 17:17:18 -08:00
Armon Dadgar 735e83a146 Merge branch 'master' of https://github.com/serenitus/terraform into serenitus-master 2014-11-19 17:15:15 -08:00
Armon Dadgar 41f2e7f98e Merge pull request #545 from rcostanzo/f-parameter-group
Added new parameter_group_name parameter for creating an RDS DB instance
2014-11-19 16:01:11 -08:00
Armon Dadgar 4303232533 Merge pull request #440 from buth/awsblockdevices
AWS Instance `block_device` Attribute
2014-11-19 15:52:00 -08:00
Armon Dadgar 8446b036d7 Merge pull request #535 from ceh/vet-fixes
argument and verb formatting fixes reported by go vet
2014-11-19 15:46:01 -08:00
Armon Dadgar fc5a13a1c1 Merge pull request #570 from svanharmelen/f-refactor-digitalocean-provider
Refactor to use the schema.Provider approach
2014-11-19 14:15:48 -08:00
Armon Dadgar 12cde243a8 Merge pull request #568 from svanharmelen/f-refactor-cloudflare-provider
Refactor to use the schema.Provider approach
2014-11-19 14:07:40 -08:00
Armon Dadgar 6afae237e5 Merge pull request #569 from svanharmelen/f-refactor-dnsimple-provider
Refactor to use the schema.Provider approach
2014-11-19 14:04:17 -08:00