refactoring

Rene Schönfelder · Rene Schönfelder · commit c47fe9f9f892 · 2025-01-31T11:25:23.000+01:00
diff --git a/modules/cloud-init/simple-setup-init.tftpl b/modules/cloud-init/simple-setup-init.tftpl
@@ -41,7 +41,7 @@ runcmd:
 %{endif}
 
 # install s3 access
-
+%{if aws_access_key_id != ""}
 - snap install aws-cli --classic
 
 %{ for user in users}
@@ -65,3 +65,12 @@ runcmd:
 - echo "region = eu-north1" >> /root/.aws/config
 
 
+# install s3 mount
+
+%{if mount_bucket != "" }
+- wget https://s3.amazonaws.com/mountpoint-s3-release/1.14.0/x86_64/mount-s3-1.14.0-x86_64.deb
+- dpkg -i mount-s3-1.14.0-x86_64.deb
+- mkdir -p ${s3_mount_path}
+- mount-s3 --upload-checksums=off --maximum-throughput-gbps=200 --allow-delete --allow-overwrite --allow-other --endpoint-url=https://storage.eu-north1.nebius.cloud:443 ${mount_bucket} ${s3_mount_path}
+%{endif}
+%{endif}
diff --git a/modules/instance/main.tf b/modules/instance/main.tf
@@ -1,6 +1,6 @@
 resource "nebius_compute_v1_disk" "boot-disk" {
   parent_id           = var.parent_id
-  name                = join("-", ["nfs-boot-disk", var.instance_name])
+  name                = join("-", ["instance-boot-disk", var.instance_name])
   block_size_bytes    = 4096
   size_bytes          = 1024 * 1024 * 1024 * var.boot_disk_size_gb
   type                = "NETWORK_SSD"
@@ -13,7 +13,7 @@ resource "nebius_compute_v1_disk" "extra-storage-disk" {
   name             = join("-", ["extra-storage-disk", var.instance_name])
   block_size_bytes = 4096
   size_bytes       = 1024 * 1024 * 1024 * var.extra_storage_size_gb
-  type             = "NETWORK_SSD"
+  type             = var.extra_storage_class
 }
 
 
@@ -60,14 +60,16 @@ resource "nebius_compute_v1_instance" "instance" {
   ] : []
 
 
-  cloud_init_user_data = templatefile("../../modules/cloud-init/simple-setup-init.tftpl", {
+  cloud_init_user_data = templatefile("../modules/cloud-init/simple-setup-init.tftpl", {
     users = local.users,
     extra_path       = local.extra_path,
     extra_disk_id    = local.extra_disk_id,
     shared_filesystem_id = var.shared_filesystem_id,
     shared_filesystem_mount = var.shared_filesystem_mount,
     aws_access_key_id = var.aws_access_key_id,
-    aws_secret_access_key = var.aws_secret_access_key
+    aws_secret_access_key = var.aws_secret_access_key,
+    mount_bucket = var.mount_bucket,
+    s3_mount_path = var.s3_mount_path
   })
 }
 
diff --git a/modules/instance/provider.tf b/modules/instance/provider.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     nebius = {
-      source = "terraform-provider-nebius.storage.ai.nebius.cloud/nebius/nebius"
+      source = "terraform-provider.storage.eu-north1.nebius.cloud/nebius/nebius"
       version= ">= 0.4.24"
     }
   }
diff --git a/modules/instance/variables.tf b/modules/instance/variables.tf
@@ -92,6 +92,13 @@ variable "extra_storage_size_gb" {
   description = "size of the newly created nfs storage"
 }
 
+variable "extra_storage_class" {
+  type = string
+  default = "NETWORK_SSD"
+  description = "Network type of additional disk being added"
+}
+
+
 variable "public_ip" {
   type = bool
   default = true
diff --git a/vm-instance/.envrc.sh b/vm-instance/.envrc.sh
diff --git a/vm-instance/README.md b/vm-instance/README.md
diff --git a/vm-instance/locals.tf b/vm-instance/locals.tf
diff --git a/vm-instance/main.tf b/vm-instance/main.tf
@@ -1,8 +1,5 @@
 module "instance-module" {
-  providers = {
-    nebius = nebius
-  }
-  source         = "../../modules/instance"
+  source         = "../modules/instance"
   parent_id      = var.parent_id
   subnet_id      = var.subnet_id
   count          = var.instance_count
@@ -16,6 +13,7 @@ module "instance-module" {
   extra_path = var.extra_path
   add_extra_storage = var.add_extra_storage
   extra_storage_size_gb = var.extra_storage_size_gb
+  extra_storage_class = var.extra_storage_class
   public_ip = var.public_ip
   mount_bucket = var.mount_bucket
   s3_mount_path = var.s3_mount_path
diff --git a/vm-instance/outputs.tf b/vm-instance/outputs.tf
diff --git a/vm-instance/provider.tf b/vm-instance/provider.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     nebius = {
-      source = "terraform-provider-nebius.storage.ai.nebius.cloud/nebius/nebius"
+      source = "terraform-provider.storage.eu-north1.nebius.cloud/nebius/nebius"
       version= ">= 0.4.24"
     }
   }
diff --git a/vm-instance/s3_keys.sh b/vm-instance/s3_keys.sh
@@ -1,5 +1,5 @@
-NEBIUS_TENANT_ID='tenant-e00f3wdfzwfjgbcyfv'
-NEBIUS_PROJECT_ID='project-e00z6b02t8ddk96c49'
+NEBIUS_TENANT_ID=''
+NEBIUS_PROJECT_ID=''
 
 if [ -z "${NEBIUS_TENANT_ID}" ]; then
   echo "Error: NEBIUS_TENANT_ID is not set"
diff --git a/vm-instance/terraform.tfvars b/vm-instance/terraform.tfvars
@@ -20,8 +20,10 @@ users = [
 ]
 
 add_extra_storage = false
+
+
 public_ip = true
 instance_count = 1
 
 shared_filesystem_id = ""
-mount_bucket = "renes-bucket"
+mount_bucket = ""
diff --git a/vm-instance/variables.tf b/vm-instance/variables.tf
@@ -78,6 +78,11 @@ variable "extra_path" {
   default = "/mnt/storage"
   description = "Folder where the network storage will be mounted on"
 }
+variable "extra_storage_class" {
+  type = string
+  default = "NETWORK_SSD"
+  description = "Network type of additional disk being added"
+}
 
 variable "extra_storage_size_gb" {
   type = number

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`nebius = {`
`4`		`- source = "terraform-provider-nebius.storage.ai.nebius.cloud/nebius/nebius"`
	`4`	`+ source = "terraform-provider.storage.eu-north1.nebius.cloud/nebius/nebius"`
`5`	`5`	`version= ">= 0.4.24"`
`6`	`6`	`}`
`7`	`7`	`}`