Pre-commit changes

Signed-off-by: Łukasz Sitkiewicz <lukasz.sitkiewicz@intel.com>
daos-stack · Apr 11, 2022 · 4d9de9a · 4d9de9a
1 parent 415180c
commit 4d9de9a
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 18 deletions.
diff --git a/terraform/examples/daos_cluster/README.md b/terraform/examples/daos_cluster/README.md
@@ -233,6 +233,7 @@ No resources.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_client_gvnic"></a> [client\_gvnic](#input\_client\_gvnic) | Use Google Virtual NIC (gVNIC) network interface on DAOS clients | `bool` | `false` | no |
 | <a name="input_client_instance_base_name"></a> [client\_instance\_base\_name](#input\_client\_instance\_base\_name) | MIG instance base names to use | `string` | `"daos-client"` | no |
 | <a name="input_client_labels"></a> [client\_labels](#input\_client\_labels) | Set of key/value label pairs to assign to daos-client instances | `any` | `{}` | no |
 | <a name="input_client_machine_type"></a> [client\_machine\_type](#input\_client\_machine\_type) | GCP machine type. ie. c2-standard-16 | `string` | `"c2-standard-16"` | no |
@@ -252,6 +253,7 @@ No resources.
 | <a name="input_server_daos_disk_count"></a> [server\_daos\_disk\_count](#input\_server\_daos\_disk\_count) | Number of local ssd's to use | `number` | `16` | no |
 | <a name="input_server_daos_disk_type"></a> [server\_daos\_disk\_type](#input\_server\_daos\_disk\_type) | Daos disk type to use. For now only suported one is local-ssd | `string` | `"local-ssd"` | no |
 | <a name="input_server_daos_scm_size"></a> [server\_daos\_scm\_size](#input\_server\_daos\_scm\_size) | scm\_size | `number` | `200` | no |
+| <a name="input_server_gvnic"></a> [server\_gvnic](#input\_server\_gvnic) | Use Google Virtual NIC (gVNIC) network interface on DAOS servers | `bool` | `false` | no |
 | <a name="input_server_instance_base_name"></a> [server\_instance\_base\_name](#input\_server\_instance\_base\_name) | MIG instance base names to use | `string` | `"daos-server"` | no |
 | <a name="input_server_labels"></a> [server\_labels](#input\_server\_labels) | Set of key/value label pairs to assign to daos-server instances | `any` | `{}` | no |
 | <a name="input_server_machine_type"></a> [server\_machine\_type](#input\_server\_machine\_type) | GCP machine type. ie. e2-medium | `string` | `"n2-custom-36-215040"` | no |

diff --git a/terraform/examples/daos_cluster/module.json b/terraform/examples/daos_cluster/module.json
@@ -2,6 +2,13 @@
   "header": "",
   "footer": "",
   "inputs": [
+    {
+      "name": "client_gvnic",
+      "type": "bool",
+      "description": "Use Google Virtual NIC (gVNIC) network interface on DAOS clients",
+      "default": false,
+      "required": false
+    },
     {
       "name": "client_instance_base_name",
       "type": "string",
@@ -145,6 +152,13 @@
       "default": 200,
       "required": false
     },
+    {
+      "name": "server_gvnic",
+      "type": "bool",
+      "description": "Use Google Virtual NIC (gVNIC) network interface on DAOS servers",
+      "default": false,
+      "required": false
+    },
     {
       "name": "server_instance_base_name",
       "type": "string",

diff --git a/terraform/modules/daos_client/README.md b/terraform/modules/daos_client/README.md
@@ -29,12 +29,14 @@ limitations under the License.
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.5 |
 | <a name="requirement_google"></a> [google](#requirement\_google) | >= 3.54.0 |
+| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.16.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_google"></a> [google](#provider\_google) | >= 3.54.0 |
+| <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | >= 4.16.0 |
 
 ## Modules
 
@@ -44,8 +46,8 @@ No modules.
 
 | Name | Type |
 |------|------|
+| [google-beta_google_compute_instance_template.daos_sig_template](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_compute_instance_template) | resource |
 | [google_compute_instance_group_manager.daos_sig](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance_group_manager) | resource |
-| [google_compute_instance_template.daos_sig_template](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance_template) | resource |
 | [google_compute_per_instance_config.named_instances](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_per_instance_config) | resource |
 | [google_compute_image.os_image](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_image) | data source |
 
@@ -55,6 +57,7 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_daos_agent_yml"></a> [daos\_agent\_yml](#input\_daos\_agent\_yml) | YAML to configure the daos agent. | `string` | n/a | yes |
 | <a name="input_daos_control_yml"></a> [daos\_control\_yml](#input\_daos\_control\_yml) | YAML configuring DAOS control. | `string` | n/a | yes |
+| <a name="input_gvnic"></a> [gvnic](#input\_gvnic) | Use Google Virtual NIC (gVNIC) network interface | `bool` | `false` | no |
 | <a name="input_instance_base_name"></a> [instance\_base\_name](#input\_instance\_base\_name) | MIG instance base names to use | `string` | `"daos-client"` | no |
 | <a name="input_labels"></a> [labels](#input\_labels) | Set of key/value label pairs to assign to daos-client instances | `any` | `{}` | no |
 | <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | GCP machine type. ie. c2-standard-16 | `string` | `"c2-standard-16"` | no |
@@ -77,4 +80,4 @@ No modules.
 ## Outputs
 
 No outputs.
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/terraform/modules/daos_client/module.json b/terraform/modules/daos_client/module.json
@@ -16,6 +16,13 @@
       "default": null,
       "required": true
     },
+    {
+      "name": "gvnic",
+      "type": "bool",
+      "description": "Use Google Virtual NIC (gVNIC) network interface",
+      "default": false,
+      "required": false
+    },
     {
       "name": "instance_base_name",
       "type": "string",
@@ -160,6 +167,11 @@
       "name": "google",
       "alias": null,
       "version": "\u003e= 3.54.0"
+    },
+    {
+      "name": "google-beta",
+      "alias": null,
+      "version": "\u003e= 4.16.0"
     }
   ],
   "requirements": [
@@ -170,21 +182,25 @@
     {
       "name": "google",
       "version": "\u003e= 3.54.0"
+    },
+    {
+      "name": "google-beta",
+      "version": "\u003e= 4.16.0"
     }
   ],
   "resources": [
     {
-      "type": "compute_instance_group_manager",
-      "name": "daos_sig",
-      "provider": "google",
-      "source": "hashicorp/google",
+      "type": "google_compute_instance_template",
+      "name": "daos_sig_template",
+      "provider": "google-beta",
+      "source": "hashicorp/google-beta",
       "mode": "managed",
       "version": "latest",
       "description": null
     },
     {
-      "type": "compute_instance_template",
-      "name": "daos_sig_template",
+      "type": "compute_instance_group_manager",
+      "name": "daos_sig",
       "provider": "google",
       "source": "hashicorp/google",
       "mode": "managed",

diff --git a/terraform/modules/daos_client/versions.tf b/terraform/modules/daos_client/versions.tf
@@ -16,7 +16,7 @@
 terraform {
   required_version = ">= 0.14.5"
   required_providers {
-    google = ">= 3.54.0"
+    google      = ">= 3.54.0"
     google-beta = ">= 4.16.0"
   }
 }
diff --git a/terraform/modules/daos_server/README.md b/terraform/modules/daos_server/README.md
@@ -29,12 +29,14 @@ limitations under the License.
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.5 |
 | <a name="requirement_google"></a> [google](#requirement\_google) | >= 3.54.0 |
+| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.16.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_google"></a> [google](#provider\_google) | >= 3.54.0 |
+| <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | >= 4.16.0 |
 
 ## Modules
 
@@ -44,8 +46,8 @@ No modules.
 
 | Name | Type |
 |------|------|
+| [google-beta_google_compute_instance_template.daos_sig_template](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_compute_instance_template) | resource |
 | [google_compute_instance_group_manager.daos_sig](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance_group_manager) | resource |
-| [google_compute_instance_template.daos_sig_template](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance_template) | resource |
 | [google_compute_per_instance_config.named_instances](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_per_instance_config) | resource |
 | [google_compute_image.os_image](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_image) | data source |
 
@@ -57,6 +59,7 @@ No modules.
 | <a name="input_daos_disk_count"></a> [daos\_disk\_count](#input\_daos\_disk\_count) | Number of local ssd's to use | `number` | `16` | no |
 | <a name="input_daos_disk_type"></a> [daos\_disk\_type](#input\_daos\_disk\_type) | Daos disk type to use. For now only suported one is local-ssd | `string` | `"local-ssd"` | no |
 | <a name="input_daos_scm_size"></a> [daos\_scm\_size](#input\_daos\_scm\_size) | scm\_size | `number` | `200` | no |
+| <a name="input_gvnic"></a> [gvnic](#input\_gvnic) | Use Google Virtual NIC (gVNIC) network interface | `bool` | `false` | no |
 | <a name="input_instance_base_name"></a> [instance\_base\_name](#input\_instance\_base\_name) | MIG instance base names to use | `string` | `"daos-server"` | no |
 | <a name="input_labels"></a> [labels](#input\_labels) | Set of key/value label pairs to assign to daos-server instances | `any` | `{}` | no |
 | <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | GCP machine type. ie. e2-medium | `string` | `"n2-custom-36-215040"` | no |
@@ -85,4 +88,4 @@ No modules.
 | <a name="output_daos_agent_yml"></a> [daos\_agent\_yml](#output\_daos\_agent\_yml) | YAML to configure the daos agent. This is typically saved in /etc/daos/daos\_agent.yml |
 | <a name="output_daos_config_script"></a> [daos\_config\_script](#output\_daos\_config\_script) | Script to configure the DAOS system. This will format the sytem with dmg -l and optionally create the specified pools. |
 | <a name="output_daos_control_yml"></a> [daos\_control\_yml](#output\_daos\_control\_yml) | YAML configuring DAOS control. This is typically saved in /etc/daos/daos\_control.yml |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/terraform/modules/daos_server/module.json b/terraform/modules/daos_server/module.json
@@ -30,6 +30,13 @@
       "default": 200,
       "required": false
     },
+    {
+      "name": "gvnic",
+      "type": "bool",
+      "description": "Use Google Virtual NIC (gVNIC) network interface",
+      "default": false,
+      "required": false
+    },
     {
       "name": "instance_base_name",
       "type": "string",
@@ -198,6 +205,11 @@
       "name": "google",
       "alias": null,
       "version": "\u003e= 3.54.0"
+    },
+    {
+      "name": "google-beta",
+      "alias": null,
+      "version": "\u003e= 4.16.0"
     }
   ],
   "requirements": [
@@ -208,21 +220,25 @@
     {
       "name": "google",
       "version": "\u003e= 3.54.0"
+    },
+    {
+      "name": "google-beta",
+      "version": "\u003e= 4.16.0"
     }
   ],
   "resources": [
     {
-      "type": "compute_instance_group_manager",
-      "name": "daos_sig",
-      "provider": "google",
-      "source": "hashicorp/google",
+      "type": "google_compute_instance_template",
+      "name": "daos_sig_template",
+      "provider": "google-beta",
+      "source": "hashicorp/google-beta",
       "mode": "managed",
       "version": "latest",
       "description": null
     },
     {
-      "type": "compute_instance_template",
-      "name": "daos_sig_template",
+      "type": "compute_instance_group_manager",
+      "name": "daos_sig",
       "provider": "google",
       "source": "hashicorp/google",
       "mode": "managed",

diff --git a/terraform/modules/daos_server/versions.tf b/terraform/modules/daos_server/versions.tf
@@ -17,7 +17,7 @@
 terraform {
   required_version = ">= 0.14.5"
   required_providers {
-    google = ">= 3.54.0"
+    google      = ">= 3.54.0"
     google-beta = ">= 4.16.0"
   }
 }