diff --git a/.changelog/12319.txt b/.changelog/12319.txt new file mode 100644 index 00000000000..34c31dbb6be --- /dev/null +++ b/.changelog/12319.txt @@ -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) +``` \ No newline at end of file diff --git a/website/docs/d/compute_network.html.markdown b/website/docs/d/compute_network.html.markdown index 2cf36ae51a9..7ed18f65fe4 100644 --- a/website/docs/d/compute_network.html.markdown +++ b/website/docs/d/compute_network.html.markdown @@ -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. diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown index 1521b7ee2cd..ed5f5e4a3f6 100644 --- a/website/docs/r/compute_instance.html.markdown +++ b/website/docs/r/compute_instance.html.markdown @@ -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}`. diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown index a2621e9d98f..4e28fc3d1be 100644 --- a/website/docs/r/compute_instance_template.html.markdown +++ b/website/docs/r/compute_instance_template.html.markdown @@ -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. diff --git a/website/docs/r/compute_network.html.markdown b/website/docs/r/compute_network.html.markdown index 6af7fb38168..95927b052d3 100644 --- a/website/docs/r/compute_network.html.markdown +++ b/website/docs/r/compute_network.html.markdown @@ -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. diff --git a/website/docs/r/compute_region_instance_template.html.markdown b/website/docs/r/compute_region_instance_template.html.markdown index 316dd7ab257..27bacc5e4bb 100644 --- a/website/docs/r/compute_region_instance_template.html.markdown +++ b/website/docs/r/compute_region_instance_template.html.markdown @@ -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.