Skip to content

Commit a51fb40

Browse files
committed
quickstarts: improve the examples
1 parent f5e4fff commit a51fb40

File tree

4 files changed

+25
-12
lines changed
  • quickstarts
    • Actiontrail/101-actiontrail-trail-docs-Example
    • Application_Real-Time_Monitoring_Service(ARMS)/101-arms-prometheus-monitoring-docs-Example
    • Cloud_Enterprise_Network(CEN)/101-cen-transit-router-vpn-attachment-docs-Example
    • ECS/101-use-case-create-an-ecs-instance

4 files changed

+25
-12
lines changed

quickstarts/Actiontrail/101-actiontrail-trail-docs-Example/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ data "alicloud_ram_roles" "example" {
2424
resource "alicloud_actiontrail_trail" "example" {
2525
trail_name = var.name
2626
sls_write_role_arn = data.alicloud_ram_roles.example.roles.0.arn
27-
sls_project_arn = "acs:log:${data.alicloud_regions.example.regions.0.id}:${data.alicloud_account.example.id}:project/${alicloud_log_project.example.name}"
27+
sls_project_arn = "acs:log:${data.alicloud_regions.example.regions.0.id}:${data.alicloud_account.example.id}:project/${alicloud_log_project.example.project_name}"
2828
}

quickstarts/Application_Real-Time_Monitoring_Service(ARMS)/101-arms-prometheus-monitoring-docs-Example/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ resource "alicloud_key_pair" "default" {
5757
}
5858

5959
resource "alicloud_cs_kubernetes_node_pool" "default" {
60-
name = "desired_size"
60+
node_pool_name = "desired_size"
6161
cluster_id = alicloud_cs_managed_kubernetes.default.id
6262
vswitch_ids = [alicloud_vswitch.vswitch.id]
6363
instance_types = [data.alicloud_instance_types.default.instance_types.0.id]
6464
system_disk_category = "cloud_efficiency"
6565
system_disk_size = 40
66-
key_name = alicloud_key_pair.default.key_name
66+
key_name = alicloud_key_pair.default.key_pair_name
6767
desired_size = 2
6868
}
6969

@@ -96,4 +96,4 @@ spec:
9696
matchLabels:
9797
app: tomcat
9898
EOF
99-
}
99+
}

quickstarts/Cloud_Enterprise_Network(CEN)/101-cen-transit-router-vpn-attachment-docs-Example/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ resource "alicloud_cen_transit_router" "example" {
1414
}
1515

1616
resource "alicloud_vpn_customer_gateway" "example" {
17-
name = var.name
18-
ip_address = "42.104.22.210"
19-
asn = "45014"
20-
description = var.name
17+
customer_gateway_name = var.name
18+
ip_address = "42.104.22.210"
19+
asn = "45014"
20+
description = var.name
2121
}
2222

2323
resource "alicloud_vpn_gateway_vpn_attachment" "example" {
@@ -81,4 +81,4 @@ resource "alicloud_cen_transit_router_vpn_attachment" "example" {
8181
zone {
8282
zone_id = data.alicloud_cen_transit_router_available_resources.default.resources.0.master_zones.0
8383
}
84-
}
84+
}

quickstarts/ECS/101-use-case-create-an-ecs-instance/main.tf

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1+
variable "region" {
2+
default = "cn-beijing"
3+
}
4+
5+
variable "instance_type" {
6+
default = "ecs.n4.tiny"
7+
}
8+
9+
variable "image_id" {
10+
default = "ubuntu_18_04_64_20G_alibase_20190624.vhd"
11+
}
12+
113
provider "alicloud" {
2-
region = "cn-beijing"
14+
region = var.region
315
}
416

517
data "alicloud_zones" "default" {
618
available_disk_category = "cloud_efficiency"
719
available_resource_creation = "VSwitch"
20+
available_instance_type = var.instance_type
821
}
922

1023
resource "alicloud_vpc" "vpc" {
@@ -28,9 +41,9 @@ resource "alicloud_instance" "instance" {
2841
availability_zone = data.alicloud_zones.default.zones.0.id
2942
security_groups = alicloud_security_group.default.*.id
3043
# series III
31-
instance_type = "ecs.n4.large"
44+
instance_type = var.instance_type
3245
system_disk_category = "cloud_efficiency"
33-
image_id = "ubuntu_18_04_64_20G_alibase_20190624.vhd"
46+
image_id = var.image_id
3447
instance_name = "test_foo"
3548
vswitch_id = alicloud_vswitch.vsw.id
3649
internet_max_bandwidth_out = 10

0 commit comments

Comments
 (0)