Skip to content

Commit

Permalink
Add RDMA features to google-beta provider (hashicorp#12319) (hashicor…
Browse files Browse the repository at this point in the history
…p#20342)

[upstream:ae71fc652e5736343fe238c04d6a2addc2780c0b]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Nov 14, 2024
1 parent 02e548b commit 804b565
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .changelog/12319.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
```release-note:enhancement
compute: added `MRDMA` and `IRDMA` options to the setting `nic_type` in the `google_compute_instance` and `google_compute_instance_template` resources (beta)
```
```release-note:enhancement
compute: added `network_profile` setting to `google_compute_network` resource (beta)
```
2 changes: 2 additions & 0 deletions website/docs/d/compute_network.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ In addition to the arguments listed above, the following attributes are exported

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

* `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.

* `subnetworks_self_links` - the list of subnetworks which belong to the network

* `self_link` - The URI of the resource.
2 changes: 1 addition & 1 deletion website/docs/r/compute_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ is desired, you will need to modify your state file manually using
array of alias IP ranges for this network interface. Can only be specified for network
interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).

* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, IDPF.
* `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.

* `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}`.

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/compute_instance_template.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ The following arguments are supported:
array of alias IP ranges for this network interface. Can only be specified for network
interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).

* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET.
* `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.

* `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.

Expand Down
8 changes: 8 additions & 0 deletions website/docs/r/compute_network.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,14 @@ The following arguments are supported:
Default value is `AFTER_CLASSIC_FIREWALL`.
Possible values are: `BEFORE_CLASSIC_FIREWALL`, `AFTER_CLASSIC_FIREWALL`.

* `network_profile` -
(Optional, [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.
This field can be set only at resource creation time. For example, the
following are valid URLs:
* https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}
* projects/{projectId}/global/networkProfiles/{network_profile_name}

* `project` - (Optional) The ID of the project in which the resource belongs.
If it is not provided, the provider project is used.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ The following arguments are supported:
array of alias IP ranges for this network interface. Can only be specified for network
interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).

* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET.
* `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.

* `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.

Expand Down

0 comments on commit 804b565

Please sign in to comment.