Skip to content

Commit c65822b

Browse files
author
mikatong
committed
update
1 parent 829d2a8 commit c65822b

File tree

3 files changed

+120
-4
lines changed

3 files changed

+120
-4
lines changed

‎.changelog/2919.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_emr_cluster: Support multi_disks.
3+
```

‎tencentcloud/services/emr/extension_emr.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ func buildResourceSpecSchema() *schema.Schema {
130130
},
131131
},
132132
},
133+
Description: "Resource details.",
133134
}
134135
}
135136

‎website/docs/r/emr_cluster.html.markdown

Lines changed: 116 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,99 @@ The following arguments are supported:
144144
When TimeUnit is m, the number filled in by this parameter indicates the length of purchase of the monthly instance of the package year, such as 1 for one month of purchase.
145145
* `time_unit` - (Optional, String) The unit of time in which the instance was purchased. When PayMode is 0, TimeUnit can only take values of s(second). When PayMode is 1, TimeUnit can only take the value m(month).
146146

147+
The `common_resource_spec` object of `resource_spec` supports the following:
148+
149+
* `cpu` - (Optional, Int, ForceNew) Number of CPU cores.
150+
* `disk_size` - (Optional, Int, ForceNew) Data disk capacity.
151+
* `disk_type` - (Optional, String, ForceNew) disk types. Value range:
152+
- CLOUD_SSD: Represents cloud SSD;
153+
- CLOUD_PREMIUM: Represents efficient cloud disk;
154+
- CLOUD_BASIC: Represents Cloud Block Storage.
155+
* `mem_size` - (Optional, Int, ForceNew) Memory size in M.
156+
* `multi_disks` - (Optional, Set, ForceNew) Cloud disk list. When the data disk is a cloud disk, use disk_type and disk_size parameters directly, and use multi_disks for excess parts.
157+
* `root_size` - (Optional, Int, ForceNew) Root disk capacity.
158+
* `spec` - (Optional, String, ForceNew) Node specification description, such as CVM.SA2.
159+
* `storage_type` - (Optional, Int, ForceNew) Storage type. Value range:
160+
- 4: Represents cloud SSD;
161+
- 5: Represents efficient cloud disk;
162+
- 6: Represents enhanced SSD Cloud Block Storage;
163+
- 11: Represents throughput Cloud Block Storage;
164+
- 12: Represents extremely fast SSD Cloud Block Storage.
165+
166+
The `core_resource_spec` object of `resource_spec` supports the following:
167+
168+
* `cpu` - (Optional, Int, ForceNew) Number of CPU cores.
169+
* `disk_size` - (Optional, Int, ForceNew) Data disk capacity.
170+
* `disk_type` - (Optional, String, ForceNew) disk types. Value range:
171+
- CLOUD_SSD: Represents cloud SSD;
172+
- CLOUD_PREMIUM: Represents efficient cloud disk;
173+
- CLOUD_BASIC: Represents Cloud Block Storage.
174+
* `mem_size` - (Optional, Int, ForceNew) Memory size in M.
175+
* `multi_disks` - (Optional, Set, ForceNew) Cloud disk list. When the data disk is a cloud disk, use disk_type and disk_size parameters directly, and use multi_disks for excess parts.
176+
* `root_size` - (Optional, Int, ForceNew) Root disk capacity.
177+
* `spec` - (Optional, String, ForceNew) Node specification description, such as CVM.SA2.
178+
* `storage_type` - (Optional, Int, ForceNew) Storage type. Value range:
179+
- 4: Represents cloud SSD;
180+
- 5: Represents efficient cloud disk;
181+
- 6: Represents enhanced SSD Cloud Block Storage;
182+
- 11: Represents throughput Cloud Block Storage;
183+
- 12: Represents extremely fast SSD Cloud Block Storage.
184+
185+
The `master_resource_spec` object of `resource_spec` supports the following:
186+
187+
* `cpu` - (Optional, Int, ForceNew) Number of CPU cores.
188+
* `disk_size` - (Optional, Int, ForceNew) Data disk capacity.
189+
* `disk_type` - (Optional, String, ForceNew) disk types. Value range:
190+
- CLOUD_SSD: Represents cloud SSD;
191+
- CLOUD_PREMIUM: Represents efficient cloud disk;
192+
- CLOUD_BASIC: Represents Cloud Block Storage.
193+
* `mem_size` - (Optional, Int, ForceNew) Memory size in M.
194+
* `multi_disks` - (Optional, Set, ForceNew) Cloud disk list. When the data disk is a cloud disk, use disk_type and disk_size parameters directly, and use multi_disks for excess parts.
195+
* `root_size` - (Optional, Int, ForceNew) Root disk capacity.
196+
* `spec` - (Optional, String, ForceNew) Node specification description, such as CVM.SA2.
197+
* `storage_type` - (Optional, Int, ForceNew) Storage type. Value range:
198+
- 4: Represents cloud SSD;
199+
- 5: Represents efficient cloud disk;
200+
- 6: Represents enhanced SSD Cloud Block Storage;
201+
- 11: Represents throughput Cloud Block Storage;
202+
- 12: Represents extremely fast SSD Cloud Block Storage.
203+
204+
The `multi_disks` object of `common_resource_spec` supports the following:
205+
206+
* `count` - (Optional, Int, ForceNew) Number of cloud disks of this type.
207+
* `disk_type` - (Optional, String, ForceNew) Cloud disk type
208+
- CLOUD_SSD: Represents cloud SSD;
209+
- CLOUD_PREMIUM: Represents efficient cloud disk;
210+
- CLOUD_HSSD: Represents enhanced SSD Cloud Block Storage.
211+
* `volume` - (Optional, Int, ForceNew) Cloud disk size.
212+
213+
The `multi_disks` object of `core_resource_spec` supports the following:
214+
215+
* `count` - (Optional, Int, ForceNew) Number of cloud disks of this type.
216+
* `disk_type` - (Optional, String, ForceNew) Cloud disk type
217+
- CLOUD_SSD: Represents cloud SSD;
218+
- CLOUD_PREMIUM: Represents efficient cloud disk;
219+
- CLOUD_HSSD: Represents enhanced SSD Cloud Block Storage.
220+
* `volume` - (Optional, Int, ForceNew) Cloud disk size.
221+
222+
The `multi_disks` object of `master_resource_spec` supports the following:
223+
224+
* `count` - (Optional, Int, ForceNew) Number of cloud disks of this type.
225+
* `disk_type` - (Optional, String, ForceNew) Cloud disk type
226+
- CLOUD_SSD: Represents cloud SSD;
227+
- CLOUD_PREMIUM: Represents efficient cloud disk;
228+
- CLOUD_HSSD: Represents enhanced SSD Cloud Block Storage.
229+
* `volume` - (Optional, Int, ForceNew) Cloud disk size.
230+
231+
The `multi_disks` object of `task_resource_spec` supports the following:
232+
233+
* `count` - (Optional, Int, ForceNew) Number of cloud disks of this type.
234+
* `disk_type` - (Optional, String, ForceNew) Cloud disk type
235+
- CLOUD_SSD: Represents cloud SSD;
236+
- CLOUD_PREMIUM: Represents efficient cloud disk;
237+
- CLOUD_HSSD: Represents enhanced SSD Cloud Block Storage.
238+
* `volume` - (Optional, Int, ForceNew) Cloud disk size.
239+
147240
The `placement_info` object supports the following:
148241

149242
* `zone` - (Required, String) Zone.
@@ -152,13 +245,32 @@ The `placement_info` object supports the following:
152245
The `resource_spec` object supports the following:
153246

154247
* `common_count` - (Optional, Int, ForceNew) The number of common node.
155-
* `common_resource_spec` - (Optional, List, ForceNew)
248+
* `common_resource_spec` - (Optional, List, ForceNew) Resource details.
156249
* `core_count` - (Optional, Int) The number of core node.
157-
* `core_resource_spec` - (Optional, List, ForceNew)
250+
* `core_resource_spec` - (Optional, List, ForceNew) Resource details.
158251
* `master_count` - (Optional, Int) The number of master node.
159-
* `master_resource_spec` - (Optional, List, ForceNew)
252+
* `master_resource_spec` - (Optional, List, ForceNew) Resource details.
160253
* `task_count` - (Optional, Int) The number of core node.
161-
* `task_resource_spec` - (Optional, List, ForceNew)
254+
* `task_resource_spec` - (Optional, List, ForceNew) Resource details.
255+
256+
The `task_resource_spec` object of `resource_spec` supports the following:
257+
258+
* `cpu` - (Optional, Int, ForceNew) Number of CPU cores.
259+
* `disk_size` - (Optional, Int, ForceNew) Data disk capacity.
260+
* `disk_type` - (Optional, String, ForceNew) disk types. Value range:
261+
- CLOUD_SSD: Represents cloud SSD;
262+
- CLOUD_PREMIUM: Represents efficient cloud disk;
263+
- CLOUD_BASIC: Represents Cloud Block Storage.
264+
* `mem_size` - (Optional, Int, ForceNew) Memory size in M.
265+
* `multi_disks` - (Optional, Set, ForceNew) Cloud disk list. When the data disk is a cloud disk, use disk_type and disk_size parameters directly, and use multi_disks for excess parts.
266+
* `root_size` - (Optional, Int, ForceNew) Root disk capacity.
267+
* `spec` - (Optional, String, ForceNew) Node specification description, such as CVM.SA2.
268+
* `storage_type` - (Optional, Int, ForceNew) Storage type. Value range:
269+
- 4: Represents cloud SSD;
270+
- 5: Represents efficient cloud disk;
271+
- 6: Represents enhanced SSD Cloud Block Storage;
272+
- 11: Represents throughput Cloud Block Storage;
273+
- 12: Represents extremely fast SSD Cloud Block Storage.
162274

163275
The `terminate_node_info` object supports the following:
164276

0 commit comments

Comments
 (0)