Skip to content

Commit 4bedf42

Browse files
authored
doc: fix rdma_cluster_id desc (#130)
* doc: fix rdma_cluster_id desc * build: update version in config and rssd example
1 parent 8698eae commit 4bedf42

9 files changed

+36
-11
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
## 1.33.0 (Unreleased)
2+
3+
NOTES:
4+
5+
* fix `rdma_cluster_id` doc.
6+
27
## 1.32.0 (2022-09-19)
38

49
FEATURES:

examples/rssd/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# RSSD Example
2+
3+
The RSSD example that creates a RSSD udisk attaches to a `O` uhost.
4+
5+
To run, configure your UCloud provider as described in https://www.terraform.io/docs/providers/ucloud/index.html
6+
7+
## Requirements
8+
9+
- [Terraform](https://www.terraform.io/downloads.html) 0.13.x
10+
11+
## Setup Environment
12+
13+
```sh
14+
export UCLOUD_PUBLIC_KEY="your public key"
15+
export UCLOUD_PRIVATE_KEY="your private key"
16+
export UCLOUD_PROJECT_ID="your project id"
17+
```
18+
19+
## Running the example
20+
21+
run `terraform apply`

examples/rssd/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ terraform {
22
required_providers {
33
ucloud = {
44
source = "ucloud/ucloud"
5+
version = "~>1.32.1"
56
}
67
}
78
}

ucloud/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (c *Config) Client() (*UCloudClient, error) {
6969
// enable auto retry with http/connection error
7070
cfg.MaxRetries = c.MaxRetries
7171
cfg.LogLevel = log.PanicLevel
72-
cfg.UserAgent = "Terraform-UCloud/1.32.0"
72+
cfg.UserAgent = "Terraform-UCloud/1.32.1"
7373
cfg.BaseUrl = c.BaseURL
7474

7575
cred := auth.NewCredential()

website/docs/d/disks.html.markdown

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,3 @@ The attribute (`disks`) support the following:
5151
* `create_time` - The creation time of Disk, formatted in RFC3339 time string.
5252
* `expire_time` - The expiration time of disk, formatted in RFC3339 time string.
5353
* `status` - The status of disk. Possible values are: `Available`, `InUse`, `Detaching`, `Initializating`, `Failed`, `Cloning`, `Restoring`, `RestoreFailed`.
54-
* `rdma_cluster_id` - The RDMA Cluster ID of disk. This is only useful with disk type `rssd_data_disk`. If you need to attach a `rssd_data_disk`to an instance, the `rdma_cluster_id` MUST BE PAIRED.

website/docs/d/instances.html.markdown

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,3 @@ The attribute (`ip_set`) supports the following:
7373

7474
* `internet_type` - Type of Elastic IP routes.
7575
* `ip` - Elastic IP address.
76-
* `rdma_cluster_id` - The RDMA Cluster ID of instance. This is only useful for instance with machine type `O`.

website/docs/index.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ terraform {
2323
required_providers {
2424
ucloud = {
2525
source = "ucloud/ucloud"
26-
version = "~>1.22.0"
26+
version = "~>1.32.1"
2727
}
2828
}
2929
}
@@ -91,7 +91,7 @@ terraform {
9191
required_providers {
9292
ucloud = {
9393
source = "ucloud/ucloud"
94-
version = "~>1.22.0"
94+
version = "~>1.32.1"
9595
}
9696
}
9797
}

website/docs/r/disk.html.markdown

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,12 @@ In addition to all arguments above, the following attributes are exported:
4949
* `create_time` - The time of creation of disk, formatted in RFC3339 time string.
5050
* `expire_time` - The expiration time of disk, formatted in RFC3339 time string.
5151
* `status` - The status of disk. Possible values are: `Available`, `InUse`, `Detaching`, `Initializating`, `Failed`, `Cloning`, `Restoring`, `RestoreFailed`.
52+
* `rdma_cluster_id` - The RDMA Cluster ID of disk. This is only useful with disk type `rssd_data_disk`. If you need to attach a `rssd_data_disk`to an instance, the `rdma_cluster_id` MUST BE PAIRED.
5253

5354
## Import
5455

5556
Disk can be imported using the `id`, e.g.
5657

5758
```
5859
$ terraform import ucloud_disk.example bsm-abcdefg
59-
```
60+
```

website/docs/r/instance.html.markdown

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The following arguments are supported:
9090
- - -
9191

9292
* `allow_stopping_for_update` - (Optional) If you try to update some properties which requires stopping the instance, you must set `allow_stopping_for_update` to `true` in your config to allows Terraform to stop the instance to update its properties like `instance_type`, `root_password`, `boot_disk_size`, `data_disk_size`.
93-
93+
9494
* `root_password` - (Optional) The password for the instance, which contains 8-30 characters, and at least 2 items of capital letters, lower case letters, numbers and special characters. The special characters include <code>`()~!@#$%^&*-+=_|{}\[]:;'<>,.?/</code>. If not specified, terraform will auto-generate a password.
9595

9696
~> **Note** If you want to update this value, you must set `allow_stopping_for_update`to `true`.
@@ -117,12 +117,10 @@ The following arguments are supported:
117117
* `delete_disks_with_instance` - (Optional, ForceNew, Required when set `data_disks`) Whether the cloud data disks attached instance should be destroyed on instance termination.
118118

119119
~> **NOTE:** We recommend set `delete_disks_with_instance` to `true` means delete cloud data disks attached to instance when instance termination. Otherwise, the cloud data disks will be not managed by the terraform after instance termination.
120-
120+
121121
* `network_interface` - (Optional, ForceNew) Additional network interface eips to attach to the instance. `network_interface` configurations only apply on resource creation. The count of `network_interface` can only be one. See [network_interface](#network_interface) below for details on attributes. When set `network_interface`, the argument `delete_eips_with_instance` must bet set.
122122
* `delete_eips_with_instance` - (Optional, ForceNew, Required when set `network_interface`) Whether the network interface eips associated instance should be destroyed on instance termination.
123-
124-
* `min_cpu_platform` - (Optional) Specifies a minimum CPU platform for the the VM instance. (Default: `Intel/Auto`). You may refer to [product documentation](https://docs.ucloud.cn/uhost/introduction/uhost/type_new) and [API documentation](https://docs.ucloud.cn/api/uhost-api/create_uhost_instance).
125-
123+
* `min_cpu_platform` - (Optional) Specifies a minimum CPU platform for the the VM instance. (Default: `Intel/Auto`). You may refer to [product documentation](https://docs.ucloud.cn/uhost/introduction/uhost/type_new) and [API documentation](https://docs.ucloud.cn/api/uhost-api/create_uhost_instance).
126124
### data_disks
127125

128126
The `data_disks` supports the following:
@@ -163,6 +161,7 @@ In addition to all arguments above, the following attributes are exported:
163161
* `status` - Instance current status. Possible values are `Initializing`, `Starting`, `Running`, `Stopping`, `Stopped`, `Install Fail`, `ResizeFail` and `Rebooting`.
164162
* `ip_set` - It is a nested type which documented below.
165163
* `disk_set` - It is a nested type which documented below.
164+
* `rdma_cluster_id` - The RDMA Cluster ID of instance. This is only available when machine type is `O`.
166165

167166
- - -
168167

0 commit comments

Comments
 (0)