Rebase from hashicorp/terraform #15
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
provider/openstack: static routing entries for routers
provider/openstack: OpenStack Mitaka Patches
ID-only tests for all resources
This reverts commit a6d9e34.
Originally I used an empty config module. This caused problems since important provider configurations weren't available. Instead, I now set it to use the full config. This isn't an issue since the attributes themselves aren't available to Refresh anyways.
* vendor: Update go-fastly * provider/fastly: Add basic Gzip support * add flattengzip tests
…1. (#6261) This description is essentially copied from the Fastly dashboard.
admin_state_up was never being passed to a load balancing member during creation.
Apex records must be created by specifying "@" as the name, but this caused Refresh and Delete errors.
The most improtant change is using record IDs as identifiers.
providers/cloudflare: record can manage apex records
Here is an example that will setup the following:
+ An SSH key resource.
+ A virtual server resource that uses an existing SSH key.
+ A virtual server resource using an existing SSH key and a Terraform managed SSH key (created as "test_key_1" in the example below).
(create this as sl.tf and run terraform commands from this directory):
```hcl
provider "softlayer" {
username = ""
api_key = ""
}
resource "softlayer_ssh_key" "test_key_1" {
name = "test_key_1"
public_key = "${file(\"~/.ssh/id_rsa_test_key_1.pub\")}"
# Windows Example:
# public_key = "${file(\"C:\ssh\keys\path\id_rsa_test_key_1.pub\")}"
}
resource "softlayer_virtual_guest" "my_server_1" {
name = "my_server_1"
domain = "example.com"
ssh_keys = ["123456"]
image = "DEBIAN_7_64"
region = "ams01"
public_network_speed = 10
cpu = 1
ram = 1024
}
resource "softlayer_virtual_guest" "my_server_2" {
name = "my_server_2"
domain = "example.com"
ssh_keys = ["123456", "${softlayer_ssh_key.test_key_1.id}"]
image = "CENTOS_6_64"
region = "ams01"
public_network_speed = 10
cpu = 1
ram = 1024
}
```
You'll need to provide your SoftLayer username and API key,
so that Terraform can connect. If you don't want to put
credentials in your configuration file, you can leave them
out:
```
provider "softlayer" {}
```
...and instead set these environment variables:
- **SOFTLAYER_USERNAME**: Your SoftLayer username
- **SOFTLAYER_API_KEY**: Your API key
…6325) * TF-6256 - SG Rule Retry - Preferring slower but consistent runs when AWS API calls do not properly return the SG Rule in the list of ingress/egress rules. - Testing has shown that several times that we had to exceed 20 attempts before the SG was actually returned * TF-6256 - Refactor of rule lookup - Adjusting to use resource.Retry - Extract lookup method for matching ipPermissions set
atlas: Use go-rootcerts for certificate loading
* provider/aws: Add support for response parameters aws_api_gateway_integration_response and aws_api_gateway_method response. * fix spacing * fix spacing * gofmt * add update test; add docs; add reimplement TODO; add field read * resolve conflict * fix expandAPIGatewayMethodResponse error handling
This diff was generated by: * `godep restore -v`, correcting any hiccups until it succeeded * `rm -rf vendor/ Godep` * `godep save -v ./...`
godeps: fixup missing deps
…lated provider/vsphere: missing memory reservation in deployVirtualMachine
…f disabled (#6407) - Addresses the issue when local state file has logging_config populated and the user disables the configuration via the UI (or in this case an application of the TF config). This will now properly set the logging_config during the read operation and identify the state as diverging Fixes #6390
provider/vsphere: Fix typos in README.
website: add a height to svg in bnr to fix IE bug
|
Shipit
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging the base fork's master to keep in sync and also fix hashicorp#5360