Commit Graph

1102 Commits

Author SHA1 Message Date
Clint 4708e66328 Merge pull request #4098 from csabapalfi/f-aws-s3-redirect-protocol
Enable specifying aws s3 redirect protocol
2016-01-22 15:51:40 -06:00
Carles Figuerola 0983ca4c2a Merge remote-tracking branch 'upstream/master' into add-tags-plus-networktags 2016-01-21 22:37:23 -06:00
Martin Atkins 7450abe408 Merge pull request #4606 from hashicorp/tls-public-key
Export public keys from tls_private_key
2016-01-21 17:01:18 -08:00
Csaba Palfi 8f6404a0e1 provider/aws enable specifying aws s3 redirect protocol
Signed-off-by: Csaba Palfi <csaba@palfi.me>
2016-01-21 23:26:13 +00:00
Sander van Harmelen 3385100f56 Make the concurrence for applying rules configurable 2016-01-21 21:30:54 +01:00
Sander van Harmelen cfa9661ffa Merge pull request #4687 from Carles-Figuerola/master
Add vlan, startip, endip and gateway for network creation
2016-01-21 17:02:56 +01:00
Carles Figuerola e2d6f7c5e9 Specify that the vlan attribute in cloudstack is only usable for ROOT admins and stop reading it back 2016-01-21 09:52:27 -06:00
James Nugent c8461eae32 Merge pull request #4698 from hashicorp/f-azurerm-storage-account
provider/azurerm: Add `azurerm_storage_account`
2016-01-21 07:25:04 -05:00
James Nugent df6e111c85 provider/dme: Clarify GTD meaning in docs 2016-01-20 20:23:36 -05:00
Mat Davies 45b3b9d181 provider/dme: Add support for `gtdLocation`
Add support for GTD (Global Traffic Director) enabled domains to the DME
provider. Specifically add `gtdLocation` to the `dme_record` resource.
2016-01-20 20:23:29 -05:00
James Nugent 8449cf9d98 provider/azurerm: `azurerm_storage_account` docs 2016-01-20 19:58:48 -05:00
stack72 d91c7080e0 Scaffold the AzureRM CDN Endpoint resource 2016-01-20 16:47:41 +00:00
chris 9aa8bbda93 provider/google: Support named_port on instance_group_manager
This allows HTTP and HTTPs load-balancers to direct traffic to ports other than tcp/80 and tcp/443.
2016-01-20 09:15:30 -05:00
Carles Figuerola b18afaa5db Add taging shared module for cloudstack and implement it in resource_network 2016-01-19 11:41:18 -06:00
stack72 183eb248df Scaffold the Azure RM CDN Profile 2016-01-19 17:37:28 +00:00
Clint 569e74c2e7 Merge pull request #4481 from ElliotG/feature/encryptedBlockDevice
provider/aws: Added support for the encryption flag on ebs_block_devices in launch configurations
2016-01-19 10:26:11 -06:00
James Nugent 0a2966d26d Merge pull request #4730 from leeprovoost/master
provider/aws: Fix principal in cloud trail bucket policy docs
2016-01-19 07:45:37 -05:00
stack72 138a6b67a4 Change the AWS Launch Configuration Documentation examples from ami to image_id 2016-01-19 10:12:50 +00:00
Lee Provoost 96f3f76118 Principal * gets rejected by AWS, use cloudtrail.amazonaws.com instead. 2016-01-19 08:54:42 +00:00
Adam Ochonicki 46c2fd68d9 Fix typo in ecr_repository_policy docs 2016-01-18 21:40:08 -05:00
stack72 a9afb489f6 Adds the ability to tag more of the Azure RM Network resources 2016-01-18 20:55:28 +00:00
stack72 2ebe2c01f1 Add acceptance tests and docs update to allow the tagging of AzureRM resource & 2016-01-18 18:35:41 +00:00
stack72 d7a7eb4644 Adds an acceptance test to the ARM Availability Set to show that tagging
and updating of tags work as expected

Also updated the documentation for azure rm availability set to
demonstrate this
2016-01-18 17:47:37 +00:00
Martin Atkins 25bd43d6f4 Export public keys from tls_private_key
In most cases private keys are used to produce certs and cert requests,
but there are some less-common cases where the PEM-formatted keypair is
used alone. The public_key_pem attribute supports such cases.

This also includes a public_key_openssh attribute, which allows this
resource to be used to generate temporary OpenSSH credentials, so that
e.g. a Terraform configuration could generate its own keypair to use
with the aws_key_pair resource. This has the same caveats as all cases
where we generate private keys in Terraform, but could be useful for
temporary/throwaway environments where the state either doesn't live for
long or is stored securely.

This builds on work started by Simarpreet Singh in #4441 .
2016-01-16 17:30:48 -08:00
stack72 acabd4d407 Change ASG Lifecycle Default Result to be computed and added a test to record what the default value is 2016-01-15 22:34:16 +00:00
James Nugent 4b7a98584a provider/docker: Mount named volumes in containers
This adds support for specifying named volumes for mounting in a
`docker_container` resource.
2016-01-15 21:59:33 +00:00
Carles Figuerola 2d0d67de1c Fix wording on the docs for resource_cloudstack_network 2016-01-15 14:26:26 -06:00
Colin Hebert e887ac2523 provider/docker: Add `docker_volume` resource 2016-01-15 17:34:53 +00:00
Carles Figuerola c80ddccc12 Add vlan, startip, endip and gateway for network creation 2016-01-14 22:59:04 -06:00
James Nugent 5834e65db9 Merge branch 'paulbellamy-docker-extra-hosts' 2016-01-15 03:05:25 +00:00
James Nugent 3380f08e5a provider/docker: Tweak and test `host_entry`
This adds acceptance tests for specifying extra hosts on Docker
containers. It also renames the repeating block from `hosts` to `host`,
which reads more naturally in the schema when multiple instances of the
block are declared.
2016-01-15 03:02:20 +00:00
James Nugent 933de6b127 provider/aws: valid values for health check types
These are as per the AWS API documentation here:
http://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateHealthCheck.html
2016-01-15 00:08:11 +00:00
James Nugent 51d09d8ebb Merge branch 'patch-1' of https://github.com/Phomias/terraform into Phomias-patch-1 2016-01-15 00:05:40 +00:00
Phomias 5ec817ba36 add port and type args aws_route53_health_check
Taking an educated guess at the valid values of the type argument based on what I read here: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating.html

and fix a typo: s/respoonse/response/
2016-01-14 15:38:23 -06:00
Seth Vargo 8dbc43639d Use HTTPS + www. for links 2016-01-14 16:03:26 -05:00
Clint 8e6fba43ef Merge pull request #4564 from hashicorp/pr-3741
provider/aws: Supporting New AWS Route53 HealthCheck additions (supersedes #3741)
2016-01-14 14:41:19 -06:00
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 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 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 7f6624e926 Merge pull request #3862 from stack72/aws-redshift
provider/aws: AWS Redshift
2016-01-13 16:52:47 -06: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 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
Lars Wander 456ec4d151 provider/google: SQL user resource, documentation & tests 2016-01-13 16:33:08 -05: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 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
Johannes Boyne df7ac2d51b Add AWS lambda alias support and documentation 2016-01-13 10:05:32 -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