ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'redshift-cluster-OwnerAccount' of https://github.com/jklukas/terraform into jklukas-redshift-cluster-OwnerAccount

This commit is contained in:
stack72 2017-02-20 19:13:12 +02:00
parent 8ea8588c52 305eaf6968
commit ee9bcadbb9
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/aws/resource_aws_redshift_cluster.go
View File

@ -245,6 +245,11 @@ func resourceAwsRedshiftCluster() *schema.Resource {
Optional: true,
},
"owner_account": {
Type: schema.TypeString,
Optional: true,
},
"tags": tagsSchema(),
},
}
@ -272,6 +277,7 @@ func resourceAwsRedshiftClusterCreate(d *schema.ResourceData, meta interface{})
NodeType: aws.String(d.Get("node_type").(string)),
PubliclyAccessible: aws.Bool(d.Get("publicly_accessible").(bool)),
AutomatedSnapshotRetentionPeriod: aws.Int64(int64(d.Get("automated_snapshot_retention_period").(int))),
OwnerAccount: aws.String(d.Get("owner_account").(string)),
}
if v, ok := d.GetOk("snapshot_cluster_identifier"); ok {

1
website/source/docs/providers/aws/r/redshift_cluster.html.markdown
View File

@ -62,6 +62,7 @@ string.
* `final_snapshot_identifier` - (Optional) The identifier of the final snapshot that is to be created immediately before deleting the cluster. If this parameter is provided, `skip_final_snapshot` must be false.
* `snapshot_identifier` - (Optional) The name of the snapshot from which to create the new cluster.
* `snapshot_cluster_identifier` - (Optional) The name of the cluster the source snapshot was created from.
* `owner_account` - (Optional) The AWS customer account used to create or copy the snapshot. Required if you are restoring a snapshot you do not own, optional if you own the snapshot.
* `iam_roles` - (Optional) A list of IAM Role ARNs to associate with the cluster. A Maximum of 10 can be associated to the cluster at any time.
* `enable_logging` - (Optional) Enables logging information such as queries and connection attempts, for the specified Amazon Redshift cluster. Defaults to `false`.
* `bucket_name` - (Optional, required when `enable_logging` is `true`) The name of an existing S3 bucket where the log files are to be stored. Must be in the same region as the cluster and the cluster must have read bucket and put object permissions.