Skip to content

Commit

Permalink
Fix documentation issues
Browse files Browse the repository at this point in the history
Add OBS subcategory for s3 resources

Fix multiple CCE subcategories

Other minor fixes
  • Loading branch information
lego963 authored and outcatcher committed Sep 1, 2020
1 parent 21c64ae commit dae8186
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 20 deletions.
4 changes: 4 additions & 0 deletions docs/data-sources/compute_availability_zones_v2.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
subcategory: "Elastic Cloud Server (ECS)"
---

# opentelekomcloud_compute_availability_zones_v2

Use this data source to get a list of availability zones from OpenTelekomCloud.
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/blockstorage_volume_v2.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "BlockStorage"
subcategory: "Elastic Volume Service (EVS)"
---

# opentelekomcloud_blockstorage_volume_v2
Expand Down
8 changes: 4 additions & 4 deletions docs/resources/cce_cluster_v3.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "Container Cluster Engine (CCE)"
subcategory: "Cloud Container Engine (CCE)"
---

# opentelekomcloud_cce_cluster_v3
Expand All @@ -12,7 +12,7 @@ Provides a cluster resource (CCE).
variable "flavor_id" { }
variable "vpc_id" { }
variable "subnet_id" { }
resource "opentelekomcloud_cce_cluster_v3" "cluster_1" {
name = "cluster"
description = "Create cluster"
Expand Down Expand Up @@ -111,8 +111,8 @@ All above argument parameters can be exported as attribute parameters along with
## Import

Cluster can be imported using the cluster id, e.g.

```sh
terraform import opentelekomcloud_cce_cluster_v3.cluster_1 4779ab1c-7c1a-44b1-a02e-93dfc361b32d
terraform import opentelekomcloud_cce_cluster_v3.cluster_1 4779ab1c-7c1a-44b1-a02e-93dfc361b32d
```

7 changes: 3 additions & 4 deletions docs/resources/cce_node_v3.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
subcategory: "Container Cluster Engine (CCE)
"
subcategory: "Cloud Container Engine (CCE)"
---

# opentelekomcloud_cce_node_v3
Expand Down Expand Up @@ -51,9 +50,9 @@ The following arguments are supported:
* `tags` - (Optional) The field is alternative to `labels`, key/value pair format.

* `annotations` - (Optional) Node annotation, key/value pair format. Changing this parameter will create a new resource.

* `flavor_id` - (Required) Specifies the flavor id. Changing this parameter will create a new resource.

* `availability_zone` - (Required) specify the name of the available partition (AZ). Changing this parameter will create a new resource.

* `key_pair` - (Required) Key pair name when logging in to select the key pair mode. Changing this parameter will create a new resource.
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/ces_alarmrule.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "Cloud Eye"
subcategory: "Cloud Eye (CES)"
---

# opentelekomcloud_ces_alarmrule
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/compute_floatingip_associate_v2.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "Elastic cloud Server (ECS)"
subcategory: "Elastic Cloud Server (ECS)"
---

# opentelekomcloud_compute_floatingip_associate_v2
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/compute_floatingip_v2.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "Elastic cloud Server (ECS)"
subcategory: "Elastic Cloud Server (ECS)"
---

# opentelekomcloud_compute_floatingip_v2
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/nat_dnat_rule_v2.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "NAT Gateway (NAT)"
subcategory: "NAT"
---

# opentelekomcloud_nat_dnat_rule_v2
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/nat_gateway_v2.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "NAT Gateway (NAT)"
subcategory: "NAT"
---

# opentelekomcloud_nat_gateway_v2
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/nat_snat_rule_v2.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "NAT Gateway (NAT)"
subcategory: "NAT"
---

# opentelekomcloud_nat_snat_rule_v2
Expand Down
10 changes: 7 additions & 3 deletions docs/resources/s3_bucket.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
subcategory: "Object Storage Service (OBS)"
---

# opentelekomcloud_s3_bucket

Provides a S3 bucket resource within OpenTelekomCloud.
Expand Down Expand Up @@ -146,7 +150,7 @@ The following arguments are supported:

* `acl` - (Optional) The [canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to apply. Defaults to "private".

* `policy` - (Optional) A valid [bucket policy](https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html) JSON document.
* `policy` - (Optional) A valid [bucket policy](https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html) JSON document.

-> **Note:** If the policy document is not specific enough (but still valid), Terraform may view
the policy as constantly changing in a `terraform plan`. In this case, please make sure you use the verbose/specific version of the policy.
Expand All @@ -171,10 +175,10 @@ The following arguments are supported:

* `error_document` - (Optional) An absolute path to the document to return in case of a 4XX error.

* `redirect_all_requests_to` - (Optional) A hostname to redirect all website requests for this bucket to. Hostname can optionally
* `redirect_all_requests_to` - (Optional) A hostname to redirect all website requests for this bucket to. Hostname can optionally
be prefixed with a protocol (`http://` or `https://`) to use when redirecting requests. The default is the protocol that is used in the original request.

* `routing_rules` - (Optional) A json array containing
* `routing_rules` - (Optional) A json array containing
[routing rules](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html)
describing redirect behavior and when redirects are applied.

Expand Down
4 changes: 4 additions & 0 deletions docs/resources/s3_bucket_object.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
subcategory: "Object Storage Service (OBS)"
---

# opentelekomcloud_s3_bucket_object

Provides a S3 bucket object resource within OpenTelekomCloud.
Expand Down
8 changes: 6 additions & 2 deletions docs/resources/s3_bucket_policy.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
subcategory: "Object Storage Service (OBS)"
---

# opentelekomcloud_s3_bucket_policy

Attaches a policy to an S3 bucket resource within OpenTelekomCloud.
Expand All @@ -24,8 +28,8 @@ resource "opentelekomcloud_s3_bucket_policy" "b" {
"Resource": "arn:aws:s3:::my_tf_test_bucket/*",
"Condition": {
"IpAddress": {"aws:SourceIp": "8.8.8.8/32"}
}
}
}
}
]}
POLICY
}
Expand Down

0 comments on commit dae8186

Please sign in to comment.