Skip to content

Commit bbe8fd5

Browse files
deepaksibmdeepaksibm
committed
resolved doc conflcts
1 parent 8ee6a7f commit bbe8fd5

File tree

3 files changed

+110
-77
lines changed

3 files changed

+110
-77
lines changed

‎website/docs/d/is_share_mount_target.html.markdown‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -47,39 +47,41 @@ The following arguments are supported:
4747

4848
The following attributes are exported:
4949

50-
- `access_control_mode` - (String) The access control mode for the share.
51-
- `created_at` - (String) The date and time that the share target was created.
52-
- `href` - (String) The URL for this share target.
53-
- `lifecycle_state` - (String) The lifecycle state of the mount target.
54-
- `mount_path` - (String) The mount path for the share. The server component of the mount path may be either an IP address or a fully qualified domain name.
55-
56-
This property will be absent if the lifecycle_state of the mount target is 'pending', failed, or deleting.
57-
58-
-> **If the share's access_control_mode is:**
59-
&#x2022; security_group: The IP address used in the mount path is the primary_ip address of the virtual network interface for this share mount target. </br>
60-
&#x2022; vpc: The fully-qualified domain name used in the mount path is an address that resolves to the share mount target. </br>
50+
- `created_at` - The date and time that the share target was created.
51+
- `href` - The URL for this share target.
52+
- `lifecycle_state` - The lifecycle state of the mount target.
53+
- `mount_path` - The mount path for the share.The IP addresses used in the mount path are currently within the IBM services IP range, but are expected to change to be within one of the VPC's subnets in the future.
6154
- `name` - The user-defined name for this share target.
62-
- `resource_type` - (String) The type of resource referenced.
55+
- `resource_type` - The type of resource referenced.
6356
- `transit_encryption` - (String) The transit encryption mode for this share target.
64-
- `vpc` - (List) The VPC to which this share target is allowing to mount the file share. Nested `vpc` blocks have the following structure:
65-
- `crn` - (String) The CRN for this VPC.
66-
- `deleted` - (String) If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
67-
- `more_info` - (String) Link to documentation about deleted resources.
68-
- `href` - (String) The URL for this VPC.
69-
- `id` - (String) The unique identifier for this VPC.
70-
- `name` - (String) The unique user-defined name for this VPC.
71-
- `resource_type` - (String) The resource type.
72-
- `subnet` - (List) The subnet of the virtual network interface for the share mount target. Nested `subnet` blocks have the following structure:
73-
- `crn` - (String) The CRN for this subnet.
74-
- `deleted` - (String) If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
75-
- `more_info` - (String) Link to documentation about deleted resources.
76-
- `href` - (String) The URL for this subnet.
77-
- `id` - (String) The unique identifier for this subnet.
78-
- `name` - (String) The unique user-defined name for this subnet.
79-
- `resource_type` - (String) The resource type.
80-
- `virtual_network_interface` - (List) The virtual network interface for this file share mount target.. Nested `virtual_network_interface` blocks have the following structure:
81-
- `crn` - (String) The CRN for this virtual network interface.
82-
- `href` - (String) The URL for this virtual network interface.
83-
- `id` - (String) The unique identifier for this virtual network interface.
84-
- `name` - (String) The unique user-defined name for this virtual network interface.
85-
- `resource_type` - (String) The resource type.
57+
- `vpc` - The VPC to which this share target is allowing to mount the file share. Nested `vpc` blocks have the following structure:
58+
- `crn` - The CRN for this VPC.
59+
- `deleted` - If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
60+
- `more_info` - Link to documentation about deleted resources.
61+
- `href` - The URL for this VPC.
62+
- `id` - The unique identifier for this VPC.
63+
- `name` - The unique user-defined name for this VPC.
64+
- `resource_type` - The resource type.
65+
- `primary_ip` - The primary IP address of the virtual network interface for the share mount target. Nested `primary_ip` blocks have the following structure:
66+
- `address` - The IP address.
67+
- `deleted` - If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
68+
- `more_info` - Link to documentation about deleted resources.
69+
- `href` - The URL for this reserved IP.
70+
- `id` - The unique identifier for this reserved IP.
71+
- `name` - The name for this reserved IP. The name is unique across all reserved IPs in a subnet.
72+
- `resource_type` - The resource type.
73+
- `subnet` - The subnet of the virtual network interface for the share mount target. Nested `vpc` blocks have the following structure:
74+
- `crn` - The CRN for this subnet.
75+
- `deleted` - If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
76+
- `more_info` - Link to documentation about deleted resources.
77+
- `href` - The URL for this subnet.
78+
- `id` - The unique identifier for this subnet.
79+
- `name` - The unique user-defined name for this subnet.
80+
- `resource_type` - The resource type.
81+
- `virtual_network_interface` - The virtual network interface for this file share mount target.. Nested `subnet` blocks have the following structure:
82+
- `crn` - The CRN for this virtual network interface.
83+
- `href` - The URL for this virtual network interface.
84+
- `id` - The unique identifier for this virtual network interface.
85+
- `name` - The unique user-defined name for this virtual network interface.
86+
- `resource_type` - The resource type.
87+

‎website/docs/d/is_share_mount_targets.html.markdown‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -40,41 +40,42 @@ The following attributes are exported:
4040

4141
- `id` - The unique identifier of the ShareTargetCollection.
4242
- `mount_targets` - Collection of share targets. Nested `targets` blocks have the following structure:
43-
- `access_control_mode` - (String) The access control mode for the share.
44-
- `created_at` - (String) The date and time that the share target was created.
45-
- `href` - (String) The URL for this share target.
46-
- `id` - (String) The unique identifier for this share target.
47-
- `lifecycle_state` - (String) The lifecycle state of the mount target.
48-
- `mount_path` - (String) The mount path for the share. The server component of the mount path may be either an IP address or a fully qualified domain name.
49-
50-
This property will be absent if the lifecycle_state of the mount target is 'pending', failed, or deleting.
51-
52-
-> **If the share's access_control_mode is:**
53-
&#x2022; security_group: The IP address used in the mount path is the primary_ip address of the virtual network interface for this share mount target. </br>
54-
&#x2022; vpc: The fully-qualified domain name used in the mount path is an address that resolves to the share mount target. </br>
55-
- `name` - (String) The user-defined name for this share target.
56-
- `resource_type` - (String) The type of resource referenced.
43+
- `created_at` - The date and time that the share target was created.
44+
- `href` - The URL for this share target.
45+
- `id` - The unique identifier for this share target.
46+
- `lifecycle_state` - The lifecycle state of the mount target.
47+
- `mount_path` - The mount path for the share.The IP addresses used in the mount path are currently within the IBM services IP range, but are expected to change to be within one of the VPC's subnets in the future.
48+
- `name` - The user-defined name for this share target.
49+
- `resource_type` - The type of resource referenced.
5750
- `transit_encryption` - (String) The transit encryption mode for this share target.
5851
- `vpc` - The VPC to which this share target is allowing to mount the file share. Nested `vpc` blocks have the following structure:
59-
- `crn` - (String) The CRN for this VPC.
60-
- `deleted` - (String) If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
61-
- `more_info` - (String) Link to documentation about deleted resources.
62-
- `href` - (String) The URL for this VPC.
63-
- `id` - (String) The unique identifier for this VPC.
64-
- `name` - (String) The unique user-defined name for this VPC.
65-
- `resource_type` - (String) The resource type.
66-
- `subnet` - (List) The subnet of the virtual network interface for the share mount target. Nested `subnet` blocks have the following structure:
67-
- `crn` - (String) The CRN for this subnet.
68-
- `deleted` - (String) If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
69-
- `more_info` - (String) Link to documentation about deleted resources.
70-
- `href` - (String) The URL for this subnet.
71-
- `id` - (String) The unique identifier for this subnet.
72-
- `name` - (String) The unique user-defined name for this subnet.
73-
- `resource_type` - (String) The resource type.
74-
- `virtual_network_interface` - (List) The virtual network interface for this file share mount target.. Nested `virtual_network_interface` blocks have the following structure:
75-
- `crn` - (String) The CRN for this virtual network interface.
76-
- `href` - (String) The URL for this virtual network interface.
77-
- `id` - (String) The unique identifier for this virtual network interface.
78-
- `name` - (String) The unique user-defined name for this virtual network interface.
79-
- `resource_type` - (String) The resource type.
52+
- `crn` - The CRN for this VPC.
53+
- `deleted` - If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
54+
- `more_info` - Link to documentation about deleted resources.
55+
- `href` - The URL for this VPC.
56+
- `id` - The unique identifier for this VPC.
57+
- `name` - The unique user-defined name for this VPC.
58+
- `resource_type` - The resource type.
59+
- `primary_ip` - The primary IP address of the virtual network interface for the share mount target. Nested `primary_ip` blocks have the following structure:
60+
- `address` - The IP address.
61+
- `deleted` - If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
62+
- `more_info` - Link to documentation about deleted resources.
63+
- `href` - The URL for this reserved IP.
64+
- `id` - The unique identifier for this reserved IP.
65+
- `name` - The name for this reserved IP. The name is unique across all reserved IPs in a subnet.
66+
- `resource_type` - The resource type.
67+
- `subnet` - The subnet of the virtual network interface for the share mount target. Nested `vpc` blocks have the following structure:
68+
- `crn` - The CRN for this subnet.
69+
- `deleted` - If present, this property indicates the referenced resource has been deleted and providessome supplementary information. Nested `deleted` blocks have the following structure:
70+
- `more_info` - Link to documentation about deleted resources.
71+
- `href` - The URL for this subnet.
72+
- `id` - The unique identifier for this subnet.
73+
- `name` - The unique user-defined name for this subnet.
74+
- `resource_type` - The resource type.
75+
- `virtual_network_interface` - The virtual network interface for this file share mount target.. Nested `subnet` blocks have the following structure:
76+
- `crn` - The CRN for this virtual network interface.
77+
- `href` - The URL for this virtual network interface.
78+
- `id` - The unique identifier for this virtual network interface.
79+
- `name` - The unique user-defined name for this virtual network interface.
80+
- `resource_type` - The resource type.
8081

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

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,25 @@ resource "ibm_is_share_mount_target" "mtarget1" {
9090
}
9191
name = "my-example-mount-target"
9292
}
93+
94+
//Create mount target with VNI ID
95+
resource "ibm_is_subnet" "example" {
96+
name = "my-subnet"
97+
vpc = ibm_is_vpc.vpc2.id
98+
zone = "br-sao-2"
99+
total_ipv4_address_count = 16
100+
}
101+
resource "ibm_is_virtual_network_interface" "example" {
102+
name = "my-example-vni"
103+
subnet = ibm_is_subnet.example.id
104+
}
105+
resource "ibm_is_share_mount_target" "mtarget1" {
106+
share = ibm_is_share.share.id
107+
virtual_network_interface {
108+
id = ibm_is_virtual_network_interface.example.id
109+
}
110+
name = "my-example-mount-target"
111+
}
93112
```
94113
## Argument Reference
95114

@@ -99,19 +118,28 @@ The following arguments are supported:
99118
- `virtual_network_interface` (Optional, List) The virtual network interface for this share mount target. Required if the share's `access_control_mode` is `security_group`.
100119
- `name` - (Required, String) Name for this virtual network interface.
101120
Nested scheme for `virtual_network_interface`:
121+
- `id` - (Optional) The ID for virtual network interface. Mutually exclusive with other `virtual_network_interface` arguments.
122+
123+
~> **Note**
124+
`id` is mutually exclusive with other `virtual_network_interface` prototype arguments
102125
- `primary_ip` - (Optional, List) The primary IP address to bind to the virtual network interface. May be either a reserved IP identity, or a reserved IP prototype object which will be used to create a new reserved IP.
103126

104127
Nested scheme for `primary_ip`:
128+
105129
- `auto_delete` - (Optional, Bool) Indicates whether this reserved IP member will be automatically deleted when either target is deleted, or the reserved IP is unbound. Defaults to `true`
106130
- `address` - (Optional, Forces new resource, String) The IP address to reserve. If unspecified, an available address on the subnet will automatically be selected.
131+
107132
- `name`- (Optional, String) The name for this reserved IP. The name must not be used by another reserved IP in the subnet. Names starting with ibm- are reserved for provider-owned resources, and are not allowed.
108-
- `reserved_ip`- (Optional, String) The unique identifier for this reserved IP
133+
- `reserved_ip`- (Optional, String) The unique identifier for this reserved IP.
134+
135+
~> **Note**
136+
Within `primary_ip`, `reserved_ip` is mutually exclusive to `auto_delete`, `address` and `name`
137+
109138
- `resource_group` - (Optional, String) The ID of the resource group to use.
110139
- `security_groups`- (Optional, List of string) The security groups to use for this virtual network interface.
111140
- `subnet` - (Optional, string) The associated subnet.
112141

113-
~> **Note**
114-
Within `primary_ip`, `reserved_ip` is mutually exclusive to `auto_delete`, `address` and `name`
142+
115143

116144
- `vpc` - (Optional, string) The VPC in which instances can mount the file share using this share target. Required if the share's `access_control_mode` is vpc.
117145
~> **Note**
@@ -127,18 +155,20 @@ The following arguments are supported:
127155
The following attributes are exported:
128156

129157
- `access_control_mode` - (String) The access control mode for the share.
130-
- `mount_target` - (String) The unique identifier of the share target
131-
- `created_at` - (String) The date and time that the share target was created.
132-
- `href` - (String) The URL for this share target.
133-
- `id` - (String) The unique identifier of the ShareTarget. The id is composed of \<ibm_is_share_id\>/\<ibm_is_share_mount_target_id\>
134-
- `lifecycle_state` - (String) The lifecycle state of the mount target.
158+
- `allow_ip_spoofing` - (Bool) Indicates whether source IP spoofing is allowed on this interface. If false, source IP spoofing is prevented on this interface. If true, source IP spoofing is allowed on this interface.
159+
- `auto_delete` - (Bool) Indicates whether this virtual network interface will be automatically deleted when target is deleted
160+
- `enable_infrastructure_nat` - (Bool) If `true`:- The VPC infrastructure performs any needed NAT operations.- `floating_ips` must not have more than one floating IP.If `false`:- Packets are passed unchanged to/from the network interface, allowing the workload to perform any needed NAT operations.- `allow_ip_spoofing` must be `false`.- If the virtual network interface is attached: - The target `resource_type` must be `bare_metal_server_network_attachment`. - The target `interface_type` must not be `hipersocket`.
135161
- `mount_path` - (String) The mount path for the share. The server component of the mount path may be either an IP address or a fully qualified domain name.
136162

137163
This property will be absent if the lifecycle_state of the mount target is 'pending', failed, or deleting.
138164

139165
-> **If the share's access_control_mode is:**
140166
&#x2022; security_group: The IP address used in the mount path is the primary_ip address of the virtual network interface for this share mount target. </br>
141167
&#x2022; vpc: The fully-qualified domain name used in the mount path is an address that resolves to the share mount target. </br>
168+
- `created_at` - (String)The date and time that the share target was created.
169+
- `href` - (String)The URL for this share target.
170+
- `id` - (String)The unique identifier of the ShareTarget. The id is composed of \<ibm_is_share_id\>/\<ibm_is_share_mount_target_id\>
171+
- `lifecycle_state` - (String)The lifecycle state of the mount target.
142172
- `resource_type` - (String) The type of resource referenced.
143173
- `transit_encryption` - (String) The transit encryption mode for this share target.
144174

0 commit comments

Comments
 (0)