Merge pull request #64 from heyealex/ddn-version

Update DDN to most recent commit (af5a5b3)
GoogleCloudPlatform · Dec 22, 2021 · 0bca94b · 0bca94b
2 parents 1e02a26 + e3205eb
commit 0bca94b
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 62 deletions.
diff --git a/resources/third-party/file-system/DDN-EXAScaler/README.md b/resources/third-party/file-system/DDN-EXAScaler/README.md
@@ -41,7 +41,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_ddn_exascaler"></a> [ddn\_exascaler](#module\_ddn\_exascaler) | github.com/DDNStorage/exascaler-cloud-terraform//gcp | 9aed885 |
+| <a name="module_ddn_exascaler"></a> [ddn\_exascaler](#module\_ddn\_exascaler) | github.com/DDNStorage/exascaler-cloud-terraform//gcp | af5a5b3 |
 
 ## Resources
 
@@ -55,20 +55,20 @@ No resources.
 | <a name="input_cls"></a> [cls](#input\_cls) | Compute client properties | <pre>object({<br>    node_type  = string<br>    node_cpu   = string<br>    nic_type   = string<br>    node_count = number<br>    public_ip  = bool<br>  })</pre> | <pre>{<br>  "nic_type": "GVNIC",<br>  "node_count": 0,<br>  "node_cpu": "Intel Cascade Lake",<br>  "node_type": "n2-standard-2",<br>  "public_ip": true<br>}</pre> | no |
 | <a name="input_clt"></a> [clt](#input\_clt) | Compute client target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 0,<br>  "disk_size": 256,<br>  "disk_type": "pd-standard"<br>}</pre> | no |
 | <a name="input_fsname"></a> [fsname](#input\_fsname) | EXAScaler filesystem name, only alphanumeric characters are allowed, and the value must be 1-8 characters long | `string` | `"exacloud"` | no |
-| <a name="input_image"></a> [image](#input\_image) | Source image properties | <pre>object({<br>    project = string<br>    name    = string<br>  })</pre> | <pre>{<br>  "name": "exascaler-cloud-v522-centos7",<br>  "project": "ddn-public"<br>}</pre> | no |
+| <a name="input_image"></a> [image](#input\_image) | Source image properties | <pre>object({<br>    project = string<br>    name    = string<br>  })</pre> | <pre>{<br>  "name": "exascaler-cloud-v523-centos7",<br>  "project": "ddn-public"<br>}</pre> | no |
 | <a name="input_local_mount"></a> [local\_mount](#input\_local\_mount) | Mountpoint (at the client instances) for this EXAScaler system | `string` | `"/shared"` | no |
 | <a name="input_mds"></a> [mds](#input\_mds) | Metadata server properties | <pre>object({<br>    node_type  = string<br>    node_cpu   = string<br>    nic_type   = string<br>    node_count = number<br>    public_ip  = bool<br>  })</pre> | <pre>{<br>  "nic_type": "GVNIC",<br>  "node_count": 1,<br>  "node_cpu": "Intel Cascade Lake",<br>  "node_type": "n2-standard-32",<br>  "public_ip": true<br>}</pre> | no |
-| <a name="input_mdt"></a> [mdt](#input\_mdt) | Metadata target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_size": 3500,<br>  "disk_type": "pd-ssd"<br>}</pre> | no |
+| <a name="input_mdt"></a> [mdt](#input\_mdt) | Metadata target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>    disk_raid  = bool<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_raid": false,<br>  "disk_size": 3500,<br>  "disk_type": "pd-ssd"<br>}</pre> | no |
 | <a name="input_mgs"></a> [mgs](#input\_mgs) | Management server properties | <pre>object({<br>    node_type  = string<br>    node_cpu   = string<br>    nic_type   = string<br>    node_count = number<br>    public_ip  = bool<br>  })</pre> | <pre>{<br>  "nic_type": "GVNIC",<br>  "node_count": 1,<br>  "node_cpu": "Intel Cascade Lake",<br>  "node_type": "n2-standard-32",<br>  "public_ip": true<br>}</pre> | no |
-| <a name="input_mgt"></a> [mgt](#input\_mgt) | Management target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_size": 128,<br>  "disk_type": "pd-standard"<br>}</pre> | no |
-| <a name="input_mnt"></a> [mnt](#input\_mnt) | Monitoring target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_size": 128,<br>  "disk_type": "pd-standard"<br>}</pre> | no |
+| <a name="input_mgt"></a> [mgt](#input\_mgt) | Management target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>    disk_raid  = bool<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_raid": false,<br>  "disk_size": 128,<br>  "disk_type": "pd-standard"<br>}</pre> | no |
+| <a name="input_mnt"></a> [mnt](#input\_mnt) | Monitoring target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>    disk_raid  = bool<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_raid": false,<br>  "disk_size": 128,<br>  "disk_type": "pd-standard"<br>}</pre> | no |
 | <a name="input_network"></a> [network](#input\_network) | Network options | <pre>object({<br>    routing = string<br>    tier    = string<br>    id      = string<br>    auto    = bool<br>    mtu     = number<br>    new     = bool<br>    nat     = bool<br>  })</pre> | <pre>{<br>  "auto": false,<br>  "id": "projects/project-name/global/networks/network-name",<br>  "mtu": 1500,<br>  "nat": false,<br>  "new": false,<br>  "routing": "REGIONAL",<br>  "tier": "STANDARD"<br>}</pre> | no |
 | <a name="input_network_self_link"></a> [network\_self\_link](#input\_network\_self\_link) | The self-link of the VPC network to where the system is connected. | `string` | `null` | no |
 | <a name="input_oss"></a> [oss](#input\_oss) | Object Storage server properties | <pre>object({<br>    node_type  = string<br>    node_cpu   = string<br>    nic_type   = string<br>    node_count = number<br>    public_ip  = bool<br>  })</pre> | <pre>{<br>  "nic_type": "GVNIC",<br>  "node_count": 3,<br>  "node_cpu": "Intel Cascade Lake",<br>  "node_type": "n2-standard-16",<br>  "public_ip": true<br>}</pre> | no |
-| <a name="input_ost"></a> [ost](#input\_ost) | Object Storage target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_size": 3500,<br>  "disk_type": "pd-ssd"<br>}</pre> | no |
+| <a name="input_ost"></a> [ost](#input\_ost) | Object Storage target properties | <pre>object({<br>    disk_bus   = string<br>    disk_type  = string<br>    disk_size  = number<br>    disk_count = number<br>    disk_raid  = bool<br>  })</pre> | <pre>{<br>  "disk_bus": "SCSI",<br>  "disk_count": 1,<br>  "disk_raid": false,<br>  "disk_size": 3500,<br>  "disk_type": "pd-ssd"<br>}</pre> | no |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Compute Platform project that will host the EXAScaler filesystem | `string` | n/a | yes |
 | <a name="input_security"></a> [security](#input\_security) | Security options | <pre>object({<br>    admin              = string<br>    public_key         = string<br>    block_project_keys = bool<br>    enable_local       = bool<br>    enable_ssh         = bool<br>    enable_http        = bool<br>    ssh_source_ranges  = list(string)<br>    http_source_ranges = list(string)<br>  })</pre> | <pre>{<br>  "admin": "stack",<br>  "block_project_keys": false,<br>  "enable_http": false,<br>  "enable_local": false,<br>  "enable_ssh": false,<br>  "http_source_ranges": [<br>    "0.0.0.0/0"<br>  ],<br>  "public_key": "~/.ssh/id_rsa.pub",<br>  "ssh_source_ranges": [<br>    "0.0.0.0/0"<br>  ]<br>}</pre> | no |
-| <a name="input_service_account"></a> [service\_account](#input\_service\_account) | Service account name used by deploy application | <pre>object({<br>    new  = bool<br>    name = string<br>  })</pre> | <pre>{<br>  "name": "default",<br>  "new": false<br>}</pre> | no |
+| <a name="input_service_account"></a> [service\_account](#input\_service\_account) | Service account name used by deploy application | <pre>object({<br>    new   = bool<br>    email = string<br>  })</pre> | <pre>{<br>  "email": null,<br>  "new": false<br>}</pre> | no |
 | <a name="input_subnetwork"></a> [subnetwork](#input\_subnetwork) | Subnetwork properties. Ignored if subnetwork\_self\_link is supplied. | <pre>object({<br>    address = string<br>    private = bool<br>    id      = string<br>    new     = bool<br>  })</pre> | <pre>{<br>  "address": "10.0.0.0/16",<br>  "id": "projects/project-name/regions/region-name/subnetworks/subnetwork-name",<br>  "new": false,<br>  "private": true<br>}</pre> | no |
 | <a name="input_subnetwork_address"></a> [subnetwork\_address](#input\_subnetwork\_address) | The IP range of internal addresses for the subnetwork | `string` | `null` | no |
 | <a name="input_subnetwork_self_link"></a> [subnetwork\_self\_link](#input\_subnetwork\_self\_link) | The self-link of the VPC subnetwork to where the system is connected. | `string` | `null` | no |

diff --git a/resources/third-party/file-system/DDN-EXAScaler/main.tf b/resources/third-party/file-system/DDN-EXAScaler/main.tf
@@ -38,7 +38,7 @@ provider "google" {
 }
 
 module "ddn_exascaler" {
-  source = "github.com/DDNStorage/exascaler-cloud-terraform//gcp?ref=9aed885"
+  source = "github.com/DDNStorage/exascaler-cloud-terraform//gcp?ref=af5a5b3"
 
   fsname          = var.fsname
   zone            = var.zone

diff --git a/resources/third-party/file-system/DDN-EXAScaler/module.json b/resources/third-party/file-system/DDN-EXAScaler/module.json
@@ -49,7 +49,7 @@
       "type": "object({\n    project = string\n    name    = string\n  })",
       "description": "Source image properties",
       "default": {
-        "name": "exascaler-cloud-v522-centos7",
+        "name": "exascaler-cloud-v523-centos7",
         "project": "ddn-public"
       },
       "required": false
@@ -76,11 +76,12 @@
     },
     {
       "name": "mdt",
-      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n  })",
+      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n    disk_raid  = bool\n  })",
       "description": "Metadata target properties",
       "default": {
         "disk_bus": "SCSI",
         "disk_count": 1,
+        "disk_raid": false,
         "disk_size": 3500,
         "disk_type": "pd-ssd"
       },
@@ -101,23 +102,25 @@
     },
     {
       "name": "mgt",
-      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n  })",
+      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n    disk_raid  = bool\n  })",
       "description": "Management target properties",
       "default": {
         "disk_bus": "SCSI",
         "disk_count": 1,
+        "disk_raid": false,
         "disk_size": 128,
         "disk_type": "pd-standard"
       },
       "required": false
     },
     {
       "name": "mnt",
-      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n  })",
+      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n    disk_raid  = bool\n  })",
       "description": "Monitoring target properties",
       "default": {
         "disk_bus": "SCSI",
         "disk_count": 1,
+        "disk_raid": false,
         "disk_size": 128,
         "disk_type": "pd-standard"
       },
@@ -160,11 +163,12 @@
     },
     {
       "name": "ost",
-      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n  })",
+      "type": "object({\n    disk_bus   = string\n    disk_type  = string\n    disk_size  = number\n    disk_count = number\n    disk_raid  = bool\n  })",
       "description": "Object Storage target properties",
       "default": {
         "disk_bus": "SCSI",
         "disk_count": 1,
+        "disk_raid": false,
         "disk_size": 3500,
         "disk_type": "pd-ssd"
       },
@@ -199,10 +203,10 @@
     },
     {
       "name": "service_account",
-      "type": "object({\n    new  = bool\n    name = string\n  })",
+      "type": "object({\n    new   = bool\n    email = string\n  })",
       "description": "Service account name used by deploy application",
       "default": {
-        "name": "default",
+        "email": null,
         "new": false
       },
       "required": false
@@ -252,7 +256,7 @@
     {
       "name": "ddn_exascaler",
       "source": "github.com/DDNStorage/exascaler-cloud-terraform//gcp",
-      "version": "9aed885",
+      "version": "af5a5b3",
       "description": null
     }
   ],