Skip to content

Commit 804b565

Browse files
Add RDMA features to google-beta provider (#12319) (#20342)
[upstream:ae71fc652e5736343fe238c04d6a2addc2780c0b] Signed-off-by: Modular Magician <[email protected]>
1 parent 02e548b commit 804b565

6 files changed

+19
-3
lines changed

.changelog/12319.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:enhancement
2+
compute: added `MRDMA` and `IRDMA` options to the setting `nic_type` in the `google_compute_instance` and `google_compute_instance_template` resources (beta)
3+
```
4+
```release-note:enhancement
5+
compute: added `network_profile` setting to `google_compute_network` resource (beta)
6+
```

website/docs/d/compute_network.html.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ In addition to the arguments listed above, the following attributes are exported
4040

4141
* `internal_ipv6_range` - The ula internal ipv6 range assigned to this network.
4242

43+
* `network_profile` - [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html) A full or partial URL of the network profile to apply to this network.
44+
4345
* `subnetworks_self_links` - the list of subnetworks which belong to the network
4446

4547
* `self_link` - The URI of the resource.

website/docs/r/compute_instance.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ is desired, you will need to modify your state file manually using
395395
array of alias IP ranges for this network interface. Can only be specified for network
396396
interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).
397397

398-
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, IDPF.
398+
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, IDPF. In the beta provider the additional values of MRDMA and IRDMA are supported.
399399

400400
* `network_attachment` - (Optional) [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html) The URL of the network attachment that this interface should connect to in the following format: `projects/{projectNumber}/regions/{region_name}/networkAttachments/{network_attachment_name}`.
401401

website/docs/r/compute_instance_template.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ The following arguments are supported:
561561
array of alias IP ranges for this network interface. Can only be specified for network
562562
interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).
563563

564-
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET.
564+
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET. In the beta provider the additional values of MRDMA and IRDMA are supported.
565565

566566
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6 or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
567567

website/docs/r/compute_network.html.markdown

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,14 @@ The following arguments are supported:
184184
Default value is `AFTER_CLASSIC_FIREWALL`.
185185
Possible values are: `BEFORE_CLASSIC_FIREWALL`, `AFTER_CLASSIC_FIREWALL`.
186186

187+
* `network_profile` -
188+
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
189+
A full or partial URL of the network profile to apply to this network.
190+
This field can be set only at resource creation time. For example, the
191+
following are valid URLs:
192+
* https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}
193+
* projects/{projectId}/global/networkProfiles/{network_profile_name}
194+
187195
* `project` - (Optional) The ID of the project in which the resource belongs.
188196
If it is not provided, the provider project is used.
189197

website/docs/r/compute_region_instance_template.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ The following arguments are supported:
527527
array of alias IP ranges for this network interface. Can only be specified for network
528528
interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).
529529

530-
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET.
530+
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET. In the beta provider the additional values of MRDMA and IRDMA are supported.
531531

532532
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6 or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
533533

0 commit comments

Comments
 (0)