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

Update alicloud

This commit is contained in:
Seth Vargo 2017-04-05 11:30:46 -04:00
parent 7110d15f19
commit e3f56e98bf
No known key found for this signature in database
GPG Key ID: C921994F9C27E0FF
19 changed files with 86 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
website/source/docs/providers/alicloud/d/images.html.markdown
View File

@ -6,13 +6,13 @@ description: |-
Provides a list of images available to the user.
---
# alicloud\_images
# alicloud_images
The Images data source list image resource list contains private images of the user and images of system resources provided by Alicloud, as well as other public images and those available on the image market.
## Example Usage
```
```hcl
data "alicloud_images" "multi_image" {
owners = "system"
name_regex = "^centos_6"

7
website/source/docs/providers/alicloud/d/instance_types.html.markdown
View File

@ -6,13 +6,13 @@ description: |-
Provides a list of Ecs Instance Types for use in alicloud_instance resource.
---
# alicloud\_instance\_types
# alicloud_instance_types
The Instance Types data source list the ecs_instance_types of Alicloud.
## Example Usage
```
```hcl
# Declare the data source
data "alicloud_instance_types" "1c2g" {
cpu_core_count = 1
@ -20,11 +20,10 @@ data "alicloud_instance_types" "1c2g" {
}
# Create ecs instance with the first matched instance_type
resource "alicloud_instance" "instance" {
instance_type = "${data.alicloud_instance_types.1c2g.instance_types.0.id}"
# Other properties...
# ...
}
```

4
website/source/docs/providers/alicloud/d/regions.html.markdown
View File

@ -6,13 +6,13 @@ description: |-
Provides a list of Availability Regions which can be used by an Alicloud account.
---
# alicloud\_regions
# alicloud_regions
The Regions data source allows access to the list of Alicloud Regions.
## Example Usage
```
```hcl
data "alicloud_regions" "current" {
current = true
}

6
website/source/docs/providers/alicloud/d/zones.html.markdown
View File

@ -6,13 +6,13 @@ description: |-
Provides a list of Availability Zones which can be used by an Alicloud account.
---
# alicloud\_zones
# alicloud_zones
The Zones data source allows access to the list of Alicloud Zones which can be accessed by an Alicloud account within the region configured in the provider.
## Example Usage
```
```hcl
# Declare the data source
data "alicloud_zones" "default" {
"available_instance_type" = "ecs.s2.large"
@ -24,7 +24,7 @@ data "alicloud_zones" "default" {
resource "alicloud_instance" "instance" {
availability_zone = "${data.alicloud_zones.default.zones.0.id}"
# Other properties...
# ...
}
```

9
website/source/docs/providers/alicloud/index.html.markdown
View File

@ -16,7 +16,7 @@ Use the navigation to the left to read about the available resources.
## Example Usage
```
```hcl
# Configure the Alicloud Provider
provider "alicloud" {
access_key = "${var.access_key}"
@ -64,7 +64,7 @@ alicloud provider block:
Usage:
```
```hcl
provider "alicloud" {
access_key = "${var.access_key}"
secret_key = "${var.secret_key}"
@ -79,13 +79,13 @@ You can provide your credentials via `ALICLOUD_ACCESS_KEY` and `ALICLOUD_SECRET_
environment variables, representing your Alicloud Access Key and Secret Key, respectively.
`ALICLOUD_REGION` is also used, if applicable:
```
```hcl
provider "alicloud" {}
```
Usage:
```
```shell
$ export ALICLOUD_ACCESS_KEY="anaccesskey"
$ export ALICLOUD_SECRET_KEY="asecretkey"
$ export ALICLOUD_REGION="cn-beijing"
@ -110,4 +110,3 @@ The following arguments are supported:
## Testing
Credentials must be provided via the `ALICLOUD_ACCESS_KEY`, and `ALICLOUD_SECRET_KEY` environment variables in order to run acceptance tests.

27
website/source/docs/providers/alicloud/r/db_instance.html.markdown
View File

@ -6,7 +6,7 @@ description: |-
Provides an RDS instance resource.
---
# alicloud\_db\_instance
# alicloud_db_instance
Provides an RDS instance resource. A DB instance is an isolated database
environment in the cloud. A DB instance can contain multiple user-created
@ -14,14 +14,16 @@ databases.
## Example Usage
```
```hcl
resource "alicloud_db_instance" "default" {
commodity_code = "rds"
engine = "MySQL"
engine_version = "5.6"
db_instance_class = "rds.mysql.t1.small"
db_instance_storage = "10"
db_instance_net_type = "Intranet"
commodity_code = "rds"
engine = "MySQL"
engine_version = "5.6"
db_instance_class = "rds.mysql.t1.small"
db_instance_storage = "10"
db_instance_net_type = "Intranet"
}
```
@ -30,13 +32,13 @@ resource "alicloud_db_instance" "default" {
The following arguments are supported:
* `engine` - (Required) Database type. Value options: MySQL, SQLServer, PostgreSQL, and PPAS.
* `engine_version` - (Required) Database version. Value options:
* `engine_version` - (Required) Database version. Value options:
- 5.5/5.6/5.7 for MySQL
- 2008r2/2012 for SQLServer
- 9.4 for PostgreSQL
- 9.3 for PPAS
* `db_instance_class` - (Required) Instance type. For details, see [Instance type table](https://intl.aliyun.com/help/doc-detail/26312.htm?spm=a3c0i.o26228en.a3.2.bRUHF3).
* `db_instance_storage` - (Required) User-defined storage space. Value range:
* `db_instance_storage` - (Required) User-defined storage space. Value range:
- [5, 2000] for MySQL/PostgreSQL/PPAS HA dual node edition;
- [20,1000] for MySQL 5.7 basic single node edition;
- [10, 2000] for SQL Server 2008R2;
@ -63,7 +65,7 @@ The following arguments are supported:
The database mapping supports the following:
* `db_name` - (Required) Name of the database requiring a uniqueness check. It may consist of lower case letters, numbers and underlines, and must start with a letter and have no more than 64 characters.
* `db_name` - (Required) Name of the database requiring a uniqueness check. It may consist of lower case letters, numbers and underlines, and must start with a letter and have no more than 64 characters.
* `character_set_name` - (Required) Character set. The value range is limited to the following:
- MySQL type:
+ utf8
@ -76,7 +78,7 @@ The database mapping supports the following:
+ SQL_Latin1_General_CP1_CI_AS
+ SQL_Latin1_General_CP1_CS_AS
+ Chinese_PRC_BIN
* `db_description` - (Optional) Database description, which cannot exceed 256 characters. NOTE: It cannot begin with https://.
* `db_description` - (Optional) Database description, which cannot exceed 256 characters. NOTE: It cannot begin with https://.
~> **NOTE:** We neither support modify any of database attribute, nor insert/remove item at the same time.
@ -103,4 +105,3 @@ The following attributes are exported:
* `backup_retention_period` - Retention days of the backup.
* `security_ips` - Security ips of instance whitelist.
* `connections` - Views all the connection information of a specified instance.

12
website/source/docs/providers/alicloud/r/disk.html.markdown
View File

@ -1,12 +1,12 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_disk"
sidebar_current: "docs-alicloud-resource-disk"
sidebar_current: "docs-alicloud-resource-disk."
description: |-
Provides a ECS Disk resource.
---
# alicloud\_disk
# alicloud_disk
Provides a ECS disk resource.
@ -14,10 +14,8 @@ Provides a ECS disk resource.
## Example Usage
```
# Create a new ECS disk.
```hcl
resource "alicloud_disk" "ecs_disk" {
# cn-beijing
availability_zone = "cn-beijing-b"
name = "New-disk"
description = "Hello ecs disk."
@ -34,7 +32,7 @@ resource "alicloud_disk" "ecs_disk" {
The following arguments are supported:
* `availability_zone` - (Required, Forces new resource) The Zone to create the disk in.
* `name` - (Optional) Name of the ECS disk. This name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Default value is null.
* `name` - (Optional) Name of the ECS disk. This name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","\_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Default value is null.
* `description` - (Optional) Description of the disk. This description can have a string of 2 to 256 characters, It cannot begin with http:// or https://. Default value is null.
* `category` - (Optional, Forces new resource) Category of the disk. Valid values are `cloud`, `cloud_efficiency` and `cloud_ssd`. Default is `cloud`.
* `size` - (Required) The size of the disk in GiBs, and its value depends on `Category`. `cloud` disk value range: 5GB ~ 2000GB and other category disk value range: 20 ~ 32768.
@ -53,4 +51,4 @@ The following attributes are exported:
* `category` - The disk category.
* `size` - The disk size.
* `snapshot_id` - The disk snapshot ID.
* `tags` - The disk tags.
* `tags` - The disk tags.

8
website/source/docs/providers/alicloud/r/disk_attachment.html.markdown
View File

@ -6,7 +6,7 @@ description: |-
Provides a ECS Disk Attachment resource.
---
# alicloud\_disk\_attachment
# alicloud_disk_attachment
Provides an Alicloud ECS Disk Attachment as a resource, to attach and detach disks from ECS Instances.
@ -14,9 +14,7 @@ Provides an Alicloud ECS Disk Attachment as a resource, to attach and detach dis
Basic usage
```
# Create a new ECS disk-attachment and use it attach one disk to a new instance.
```hcl
resource "alicloud_security_group" "ecs_sg" {
name = "terraform-test-group"
description = "New security group"
@ -65,4 +63,4 @@ The following attributes are exported:
* `instance_id` - ID of the Instance.
* `disk_id` - ID of the Disk.
* `device_name` - The device name exposed to the instance.
* `device_name` - The device name exposed to the instance.

6
website/source/docs/providers/alicloud/r/eip.html.markdown
View File

@ -1,18 +1,18 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_eip"
sidebar_current: "docs-alicloud-resource-eip"
sidebar_current: "docs-alicloud-resource-eip."
description: |-
Provides a ECS EIP resource.
---
# alicloud\_eip
# alicloud_eip
Provides a ECS EIP resource.
## Example Usage
```
```hcl
# Create a new EIP.
resource "alicloud_eip" "example" {
bandwidth = "10"

8
website/source/docs/providers/alicloud/r/eip_association.html.markdown
View File

@ -6,7 +6,7 @@ description: |-
Provides a ECS EIP Association resource.
---
# alicloud\_eip\_association
# alicloud_eip_association
Provides an Alicloud EIP Association resource, to associate and disassociate Elastic IPs from ECS Instances.
@ -16,9 +16,7 @@ Provides an Alicloud EIP Association resource, to associate and disassociate Ela
## Example Usage
```
# Create a new EIP association and use it to associate a EIP form a instance.
```hcl
resource "alicloud_vpc" "vpc" {
cidr_block = "10.1.0.0/21"
}
@ -73,4 +71,4 @@ The following arguments are supported:
The following attributes are exported:
* `allocation_id` - As above.
* `instance_id` - As above.
* `instance_id` - As above.

20
website/source/docs/providers/alicloud/r/instance.html.markdown
View File

@ -6,13 +6,13 @@ description: |-
Provides a ECS instance resource.
---
# alicloud\_ecs
# alicloud_ecs
Provides a ECS instance resource.
## Example Usage
```
```hcl
# Create a new ECS instance for classic
resource "alicloud_security_group" "classic" {
name = "tf_test_foo"
@ -36,11 +36,11 @@ resource "alicloud_instance" "classic" {
# Create a new ECS instance for VPC
resource "alicloud_vpc" "default" {
# Other parameters...
# ...
}
resource "alicloud_vswitch" "default" {
# Other parameters...
# ...
}
resource "alicloud_slb" "vpc" {
@ -59,18 +59,18 @@ The following arguments are supported:
* `io_optimized` - (Required) Valid values are `none`, `optimized`, If `optimized`, the launched ECS instance will be I/O optimized.
* `security_group_ids` - (Optional) A list of security group ids to associate with.
* `availability_zone` - (Optional) The Zone to start the instance in.
* `instance_name` - (Optional) The name of the ECS. This instance_name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","_", and must not begin or end with a hyphen, and must not begin with http:// or https://. If not specified,
* `instance_name` - (Optional) The name of the ECS. This instance_name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","\_", and must not begin or end with a hyphen, and must not begin with http:// or https://. If not specified,
Terraform will autogenerate a default name is `ECS-Instance`.
* `allocate_public_ip` - (Optional) Associate a public ip address with an instance in a VPC or Classic. Boolean value, Default is false.
* `system_disk_category` - (Optional) Valid values are `cloud`, `cloud_efficiency`, `cloud_ssd`, For I/O optimized instance type, `cloud_ssd` and `cloud_efficiency` disks are supported. For non I/O Optimized instance type, `cloud` disk are supported.
* `system_disk_category` - (Optional) Valid values are `cloud`, `cloud_efficiency`, `cloud_ssd`, For I/O optimized instance type, `cloud_ssd` and `cloud_efficiency` disks are supported. For non I/O Optimized instance type, `cloud` disk are supported.
* `system_disk_size` - (Optional) Size of the system disk, value range: 40GB ~ 500GB. Default is 40GB.
* `description` - (Optional) Description of the instance, This description can have a string of 2 to 256 characters, It cannot begin with http:// or https://. Default value is null.
* `internet_charge_type` - (Optional) Internet charge type of the instance, Valid values are `PayByBandwidth`, `PayByTraffic`. Default is `PayByBandwidth`.
* `internet_max_bandwidth_in` - (Optional) Maximum incoming bandwidth from the public network, measured in Mbps (Mega bit per second). Value range: [1, 200]. If this value is not specified, then automatically sets it to 200 Mbps.
* `internet_max_bandwidth_out` - (Optional) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). Value range:
* `internet_max_bandwidth_out` - (Optional) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). Value range:
`internet_charge_type` is `PayByBandwidth`: this value range [0, 100], If this value is not specified, then automatically sets it to 0 Mbps; If `internet_charge_type` is `PayByTraffic`: this value range [1, 100]. this value must be set value, such as 5.
* `host_name` - (Optional) Host name of the ECS, which is a string of at least two characters. “hostname” cannot start or end with “.” or “-“. In addition, two or more consecutive “.” or “-“ symbols are not allowed. On Windows, the host name can contain a maximum of 15 characters, which can be a combination of uppercase/lowercase letters, numerals, and “-“. The host name cannot contain dots (“.”) or contain only numeric characters.
On other OSs such as Linux, the host name can contain a maximum of 30 characters, which can be segments separated by dots (“.”), where each segment can contain uppercase/lowercase letters, numerals, or “_“.
* `host_name` - (Optional) Host name of the ECS, which is a string of at least two characters. "hostname” cannot start or end with ".” or "-". In addition, two or more consecutive ".” or "-" symbols are not allowed. On Windows, the host name can contain a maximum of 15 characters, which can be a combination of uppercase/lowercase letters, numerals, and "-". The host name cannot contain dots (".”) or contain only numeric characters.
On other OSs such as Linux, the host name can contain a maximum of 30 characters, which can be segments separated by dots (".”), where each segment can contain uppercase/lowercase letters, numerals, or "\_".
* `password` - (Optional) Password to an instance is a string of 8 to 30 characters. It must contain uppercase/lowercase letters and numerals, but cannot contain special symbols.
* `vswitch_id` - (Optional) The virtual switch ID to launch in VPC. If you want to create instances in VPC network, this parameter must be set.
* `instance_charge_type` - (Optional) Valid values are `PrePaid`, `PostPaid`, The default is `PostPaid`.
@ -94,4 +94,4 @@ The following attributes are exported:
* `private_ip` - The instance private ip.
* `public_ip` - The instance public ip.
* `vswitch_id` - If the instance created in VPC, then this value is virtual switch ID.
* `tags` - The instance tags, use jsonencode(item) to display the value.
* `tags` - The instance tags, use jsonencode(item) to display the value.

17
website/source/docs/providers/alicloud/r/nat_gateway.html.markdown
View File

@ -6,7 +6,7 @@ description: |-
Provides a resource to create a VPC NAT Gateway.
---
# alicloud\_nat\_gateway
# alicloud_nat_gateway
Provides a resource to create a VPC NAT Gateway.
@ -14,7 +14,7 @@ Provides a resource to create a VPC NAT Gateway.
Basic usage
```
```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"
@ -31,11 +31,12 @@ resource "alicloud_nat_gateway" "nat_gateway" {
spec = "Small"
name = "test_foo"
bandwidth_packages = [{
ip_count = 1
bandwidth = 5
zone = "cn-beijing-b"
},
bandwidth_packages = [
{
ip_count = 1
bandwidth = 5
zone = "cn-beijing-b"
},
{
ip_count = 2
bandwidth = 10
@ -55,7 +56,7 @@ The following arguments are supported:
* `vpc_id` - (Required, Forces New Resorce) The VPC ID.
* `spec` - (Required, Forces New Resorce) The specification of the nat gateway. Valid values are `Small`, `Middle` and `Large`. Details refer to [Nat Gateway Specification](https://help.aliyun.com/document_detail/42757.html?spm=5176.doc32322.6.559.kFNBzv)
* `name` - (Optional) Name of the nat gateway. The value can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Defaults to null.
* `name` - (Optional) Name of the nat gateway. The value can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","\_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Defaults to null.
* `description` - (Optional) Description of the nat gateway, This description can have a string of 2 to 256 characters, It cannot begin with http:// or https://. Defaults to null.
* `bandwidth_packages` - (Required) A list of bandwidth packages for the nat gatway.

11
website/source/docs/providers/alicloud/r/security_group.html.markdown
View File

@ -1,12 +1,12 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_security_group"
sidebar_current: "docs-alicloud-resource-security-group"
sidebar_current: "docs-alicloud-resource-security-group."
description: |-
Provides a Alicloud Security Group resource.
---
# alicloud\_security\_group
# alicloud_security_group
Provides a security group resource.
@ -16,15 +16,16 @@ Provides a security group resource.
Basic Usage
```
```hcl
resource "alicloud_security_group" "group" {
name = "terraform-test-group"
description = "New security group"
}
```
Basic usage for vpc
```
```hcl
resource "alicloud_security_group" "group" {
name = "new-group"
vpc_id = "${alicloud_vpc.vpc.id}"
@ -50,4 +51,4 @@ The following attributes are exported:
* `id` - The ID of the security group
* `vpc_id` - The VPC ID.
* `name` - The name of the security group
* `description` - The description of the security group
* `description` - The description of the security group

4
website/source/docs/providers/alicloud/r/security_group_rule.html.markdown
View File

@ -6,7 +6,7 @@ description: |-
Provides a Alicloud Security Group Rule resource.
---
# alicloud\_security\_group\_rule
# alicloud_security_group_rule
Provides a security group rule resource.
Represents a single `ingress` or `egress` group rule, which can be added to external Security Groups.
@ -18,7 +18,7 @@ Represents a single `ingress` or `egress` group rule, which can be added to exte
Basic Usage
```
```hcl
resource "alicloud_security_group" "default" {
name = "default"
}

14
website/source/docs/providers/alicloud/r/slb.html.markdown
View File

@ -1,18 +1,18 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_slb"
sidebar_current: "docs-alicloud-resource-slb"
sidebar_current: "docs-alicloud-resource-slb."
description: |-
Provides an Application Load Banlancer resource.
---
# alicloud\_slb
# alicloud_slb
Provides an Application Load Balancer resource.
## Example Usage
```
```hcl
# Create a new load balancer for classic
resource "alicloud_slb" "classic" {
name = "test-slb-tf"
@ -44,11 +44,11 @@ resource "alicloud_slb" "classic" {
# Create a new load balancer for VPC
resource "alicloud_vpc" "default" {
# Other parameters...
# ...
}
resource "alicloud_vswitch" "default" {
# Other parameters...
# ...
}
resource "alicloud_slb" "vpc" {
@ -62,7 +62,7 @@ resource "alicloud_slb" "vpc" {
The following arguments are supported:
* `name` - (Optional) The name of the SLB. This name must be unique within your AliCloud account, can have a maximum of 80 characters,
must contain only alphanumeric characters or hyphens, such as "-","/",".","_", and must not begin or end with a hyphen. If not specified,
must contain only alphanumeric characters or hyphens, such as "-","/",".","\_", and must not begin or end with a hyphen. If not specified,
Terraform will autogenerate a name beginning with `tf-lb`.
* `internet` - (Optional, Forces New Resource) If true, the SLB addressType will be internet, false will be intranet, Default is false. If load balancer launched in VPC, this value must be "false".
* `internet_charge_type` - (Optional, Forces New Resource) Valid
@ -91,4 +91,4 @@ The following attributes are exported:
* `internet_charge_type` - The internet_charge_type of the load balancer.
* `bandwidth` - The bandwidth of the load balancer.
* `vswitch_id` - The VSwitch ID of the load balancer. Only available on SLB launched in a VPC.
* `address` - The IP address of the load balancer.
* `address` - The IP address of the load balancer.

8
website/source/docs/providers/alicloud/r/slb_attachment.html.markdown
View File

@ -6,20 +6,20 @@ description: |-
Provides an Application Load Banlancer Attachment resource.
---
# alicloud\_slb\_attachment
# alicloud_slb_attachment
Provides an Application Load Balancer Attachment resource.
## Example Usage
```
```hcl
# Create a new load balancer attachment for classic
resource "alicloud_slb" "default" {
# Other parameters...
# ...
}
resource "alicloud_instance" "default" {
# Other parameters...
# ...
}
resource "alicloud_slb_attachment" "default" {

3
website/source/docs/providers/alicloud/r/vpc.html.markdown
View File

@ -16,12 +16,13 @@ Provides a VPC resource.
Basic Usage
```
```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"
}
```
## Argument Reference
The following arguments are supported:

4
website/source/docs/providers/alicloud/r/vroute_entry.html.markdown
View File

@ -14,7 +14,7 @@ Provides a route entry resource.
Basic Usage
```
```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"
@ -29,7 +29,7 @@ resource "alicloud_route_entry" "default" {
}
resource "alicloud_instance" "snat" {
// ...
# ...
}
```
## Argument Reference

4
website/source/docs/providers/alicloud/r/vswitch.html.markdown
View File

@ -6,7 +6,7 @@ description: |-
Provides a Alicloud VPC switch resource.
---
# alicloud\_vswitch
# alicloud_vswitch
Provides a VPC switch resource.
@ -14,7 +14,7 @@ Provides a VPC switch resource.
Basic Usage
```
```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"