More tweaks from PR comments

GoogleCloudPlatform · Oct 21, 2023 · bde527d · bde527d
1 parent 22f4aa3
commit bde527d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/mmv1/products/tpuv2/Vm.yaml b/mmv1/products/tpuv2/Vm.yaml
@@ -118,14 +118,18 @@ properties:
         immutable: true
         description: |
           The name of the network for the TPU node. It must be a preexisting Google Compute Engine
-          network. If none is provided, "default" will be used.
+          network. If both network and subnetwork are specified, the given subnetwork must belong
+          to the given network. If network is not specified, it will be looked up from the
+          subnetwork if one is provided, or otherwise use "default".
       - !ruby/object:Api::Type::String
         name: 'subnetwork'
         default_from_api: true
         immutable: true
         description: |
           The name of the subnetwork for the TPU node. It must be a preexisting Google Compute
-          Engine subnetwork. If none is provided, "default" will be used.
+          Engine subnetwork. If both network and subnetwork are specified, the given subnetwork
+          must belong to the given network. If subnetwork is not specified, the subnetwork with the
+          same name as the network will be used.
       - !ruby/object:Api::Type::Boolean
         name: 'enableExternalIps'
         immutable: true

diff --git a/mmv1/templates/terraform/examples/tpu_v2_vm_full.tf.erb b/mmv1/templates/terraform/examples/tpu_v2_vm_full.tf.erb
@@ -76,7 +76,7 @@ resource "google_service_account" "sa" {
   provider = google-beta
 
   account_id   = "<%= ctx[:vars]['sa_id'] %>"
-  display_name = "Test TPU V2 VM"
+  display_name = "Test TPU VM"
 }
 
 resource "google_compute_disk" "disk" {