Commit Graph

2311 Commits

Author SHA1 Message Date
Sneha Somwanshi ad03446f98 Merge remote-tracking branch 'upstream/master' 2014-12-03 11:43:23 +05:30
Mitchell Hashimoto 5d89cae1d7 Merge pull request #618 from anubhavmishra/master
Fixed HCL variable declaration
2014-12-01 21:57:35 -08:00
Anubhav Mishra cf390bec3b Fixed HCL variable declaration 2014-12-01 21:55:41 -08:00
Armon Dadgar 4b8151ec6d Merge pull request #611 from Banno/fix-multivar-in-modules
looking up count of multivars in correct module config
2014-11-30 12:06:02 -07:00
Luke Amdor 60022978a6 adding context test for module multi-vars 2014-11-28 13:16:33 -06:00
Luke Amdor 4b3bf76406 looking up count of multivars in module config 2014-11-28 07:14:58 -06:00
Sneha Somwanshi f63e032c23 Merge remote-tracking branch 'upstream/master' 2014-11-26 17:06:42 +05:30
Armon Dadgar a5d444b8e3 terraform: fix module output handling. Fixes #474 2014-11-24 19:18:52 -08:00
Armon Dadgar f26b8df92f Merge pull request #598 from hashicorp/f-mod-deps
Fix dependency handling of modules
2014-11-24 18:53:22 -08:00
Armon Dadgar 5b025c89f9 terraform: guard output types. Fixes #593 2014-11-24 16:49:38 -08:00
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
Armon Dadgar d8ecb32a7c terraform: test module is marked for destroy 2014-11-24 15:50:15 -08:00
Armon Dadgar 56a34087ba terraform: test orphan dependency inversion 2014-11-24 15:42:58 -08:00
Armon Dadgar 5376e05add terraform: test encoding module dependencies 2014-11-24 15:25:37 -08:00
Armon Dadgar 6af820f78b terraform: test graph with orphan module dependencies 2014-11-24 15:22:37 -08:00
Armon Dadgar 3bdaccdf5d terraform: testing the destroy order of modules 2014-11-24 14:58:52 -08:00
Armon Dadgar afef564108 terraform: Handle module depedency inversion 2014-11-24 14:38:06 -08:00
Armon Dadgar d5fd4dabe8 terraform: Mark modules for destroy 2014-11-24 14:15:24 -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
Seth Vargo a2de5ba73b Merge pull request #592 from lamielle/patch-1
Update variables.html.md
2014-11-23 10:27:30 -05:00
Alan LaMielle 3488afa6ae Update consul.html.markdown
Fixes typo: s/features/feature
2014-11-22 21:09:39 -08:00
Alan LaMielle c6bf21baf0 Update variables.html.md
Fixes typo: s/anythiing/anything
2014-11-22 17:55:20 -08:00
Armon Dadgar 9c6280f64b terraform: encode module dependencies 2014-11-21 16:44:20 -08:00
Armon Dadgar ec1c026b80 terraform: initialize and attach module state 2014-11-21 16:41:48 -08:00
Armon Dadgar 6e1ef1c634 terraform: restore dependencies for orphan modules 2014-11-21 16:14:57 -08:00
Armon Dadgar 9707eb3fc8 terraform: Add dependencies field to modules 2014-11-21 15:34:23 -08: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
Ryan Uber 81f008ba53 Merge pull request #590 from davedash/patch-1
Fix typo in output.html.markdown
2014-11-20 23:06:51 -08:00
Dave Dash 5eb216226b Update output.html.markdown 2014-11-20 23:00:02 -08:00
Seth Vargo 94e1eac051 Merge pull request #547 from ceh/issue-518
Fix issue 518
2014-11-20 13:30:14 -05:00
Emil Hessman 31dd7d8391 command/init: use a more semantic name to identiy the test routine for issue 518 2014-11-20 19:17:04 +01: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
Seth Vargo cb679c119f Merge pull request #587 from svanharmelen/f-update-digitalocean-provider
Really small update fixing a cosmetic inconsistentie
2014-11-20 11:15:52 -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 4cdeb4b846 Merge pull request #554 from rcostanzo/f-array-index
Added an element interpolation lookup function for accessing a specific ...
2014-11-19 16:02:34 -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 38aec9f20b provide/aws: Document the block device 2014-11-19 15:59:29 -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