From e0484980e90ea9c88bdcdf014c415e4466db1020 Mon Sep 17 00:00:00 2001 From: mik-tf Date: Sun, 19 Jan 2025 10:34:48 -0500 Subject: [PATCH] change disk_name to name --- .../flist_case_studies/flist_nextcloud_case_study.md | 2 +- src/documentation/developers/tfcmd/tfcmd_vm.md | 2 +- .../pulumi/pulumi_deployment_details.md | 6 +++--- .../advanced/terraform_mariadb_synced_databases.md | 4 ++-- .../terraform/advanced/terraform_mounts.md | 2 +- .../advanced/terraform_nextcloud_redundant.md | 6 +++--- .../terraform/advanced/terraform_nextcloud_single.md | 2 +- .../terraform/advanced/terraform_nextcloud_vpn.md | 4 ++-- .../terraform/advanced/terraform_nomad.md | 10 +++++----- .../terraform/advanced/terraform_wireguard_ssh.md | 2 +- .../terraform/advanced/terraform_wireguard_vpn.md | 4 ++-- .../system_administrators/terraform/grid_terraform.md | 4 ++-- .../terraform/resources/terraform_caprover.md | 6 +++--- .../terraform/resources/terraform_qsfs_on_full_vm.md | 8 ++++---- .../terraform/resources/terraform_qsfs_on_microvm.md | 2 +- .../terraform/terraform_basic_example.md | 4 ++-- .../terraform/terraform_full_vm.md | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/documentation/developers/flist/flist_case_studies/flist_nextcloud_case_study.md b/src/documentation/developers/flist/flist_case_studies/flist_nextcloud_case_study.md index d33bd248..18ccc4cc 100644 --- a/src/documentation/developers/flist/flist_case_studies/flist_nextcloud_case_study.md +++ b/src/documentation/developers/flist/flist_case_studies/flist_nextcloud_case_study.md @@ -761,7 +761,7 @@ resource "grid_deployment" "d1" { NEXTCLOUD_DOMAIN = data.grid_gateway_domain.domain.fqdn } mounts { - disk_name = "data" + name = "data" mount_point = "/mnt/data" } } diff --git a/src/documentation/developers/tfcmd/tfcmd_vm.md b/src/documentation/developers/tfcmd/tfcmd_vm.md index af9242ae..58ac947c 100644 --- a/src/documentation/developers/tfcmd/tfcmd_vm.md +++ b/src/documentation/developers/tfcmd/tfcmd_vm.md @@ -114,7 +114,7 @@ $ tfcmd get vm examplevm "entrypoint": "/sbin/zinit init", "mounts": [ { - "disk_name": "examplevmdisk", + "name": "examplevmdisk", "mount_point": "/data" } ], diff --git a/src/documentation/system_administrators/pulumi/pulumi_deployment_details.md b/src/documentation/system_administrators/pulumi/pulumi_deployment_details.md index 7d77aed1..5ca8174a 100644 --- a/src/documentation/system_administrators/pulumi/pulumi_deployment_details.md +++ b/src/documentation/system_administrators/pulumi/pulumi_deployment_details.md @@ -238,7 +238,7 @@ resources: mycelium: true # mycelium_ip_seed: b60f2b7ec39c # hex encoded 6 bytes [example] mounts: - - disk_name: data + - name: data mount_point: /app env_vars: SSH_KEY: @@ -277,7 +277,7 @@ We have a scheduler, and a network just like before. But now, we also have a dep mycelium: true # mycelium_ip_seed: b60f2b7ec39c # hex encoded 6 bytes [example] mounts: - - disk_name: data + - name: data mount_point: /app env_vars: SSH_KEY: @@ -287,7 +287,7 @@ We have a scheduler, and a network just like before. But now, we also have a dep size: 2 ``` -The deployment can be linked to a network using `network_name` and can have virtual machines in the `vms` section, and disks in the `disks` section. The disk can be linked and mounted in the VM if `disk_name` is used in the `mounts` section of the VM. +The deployment can be linked to a network using `network_name` and can have virtual machines in the `vms` section, and disks in the `disks` section. The disk can be linked and mounted in the VM if `name` is used in the `mounts` section of the VM. We also specify a couple of essential properties, like how many virtual cores, how much memory, what FList to use, and the environment variables in the `env_vars` section. diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_mariadb_synced_databases.md b/src/documentation/system_administrators/terraform/advanced/terraform_mariadb_synced_databases.md index 240984a1..47439f30 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_mariadb_synced_databases.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_mariadb_synced_databases.md @@ -163,7 +163,7 @@ resource "grid_deployment" "d1" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } memory = var.memory @@ -190,7 +190,7 @@ resource "grid_deployment" "d2" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk2" + name = "disk2" mount_point = "/disk2" } memory = var.memory diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_mounts.md b/src/documentation/system_administrators/terraform/advanced/terraform_mounts.md index 38abc621..fb63f15e 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_mounts.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_mounts.md @@ -43,7 +43,7 @@ resource "grid_deployment" "d1" { memory = 1024 entrypoint = "/sbin/zinit init" mounts { - disk_name = "data" + name = "data" mount_point = "/app" } env_vars = { diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_redundant.md b/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_redundant.md index cbcb2113..5230554d 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_redundant.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_redundant.md @@ -176,7 +176,7 @@ resource "grid_deployment" "d1" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } memory = var.memory @@ -203,7 +203,7 @@ resource "grid_deployment" "d2" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk2" + name = "disk2" mount_point = "/disk2" } memory = var.memory @@ -751,7 +751,7 @@ To avoid errors, set HTTPS with the master VM and power off the worker VM. flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk2" + name = "disk2" mount_point = "/disk2" } memory = var.memory diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_single.md b/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_single.md index eeee4443..ff65c2e1 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_single.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_single.md @@ -166,7 +166,7 @@ resource "grid_deployment" "d1" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } memory = var.memory diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_vpn.md b/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_vpn.md index 89ca5313..e622d141 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_vpn.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_nextcloud_vpn.md @@ -169,7 +169,7 @@ resource "grid_deployment" "d1" { NEXTCLOUD_DOMAIN = data.grid_gateway_domain.domain.fqdn } mounts { - disk_name = "data" + name = "data" mount_point = "/mnt/data" } } @@ -188,7 +188,7 @@ resource "grid_deployment" "d2" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu_vm2 mounts { - disk_name = "disk2" + name = "disk2" mount_point = "/disk2" } memory = var.memory_vm2 diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_nomad.md b/src/documentation/system_administrators/terraform/advanced/terraform_nomad.md index 02de8d88..2228ddd2 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_nomad.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_nomad.md @@ -122,7 +122,7 @@ resource "grid_deployment" "d1" { cpu = var.cpu memory = var.memory mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } entrypoint = "/sbin/zinit init" @@ -138,7 +138,7 @@ resource "grid_deployment" "d1" { cpu = var.cpu memory = var.memory mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } entrypoint = "/sbin/zinit init" @@ -154,7 +154,7 @@ resource "grid_deployment" "d1" { cpu = var.cpu memory = var.memory mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } entrypoint = "/sbin/zinit init" @@ -170,7 +170,7 @@ resource "grid_deployment" "d1" { cpu = var.cpu memory = var.memory mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } entrypoint = "/sbin/zinit init" @@ -186,7 +186,7 @@ resource "grid_deployment" "d1" { cpu = var.cpu memory = var.memory mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } entrypoint = "/sbin/zinit init" diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_ssh.md b/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_ssh.md index 214e9bb0..1fbf0af9 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_ssh.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_ssh.md @@ -140,7 +140,7 @@ resource "grid_deployment" "d1" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } memory = var.memory diff --git a/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_vpn.md b/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_vpn.md index 0815dce1..c7e30c5e 100644 --- a/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_vpn.md +++ b/src/documentation/system_administrators/terraform/advanced/terraform_wireguard_vpn.md @@ -147,7 +147,7 @@ resource "grid_deployment" "d1" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } memory = var.memory @@ -174,7 +174,7 @@ resource "grid_deployment" "d2" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk2" + name = "disk2" mount_point = "/disk2" } memory = var.memory diff --git a/src/documentation/system_administrators/terraform/grid_terraform.md b/src/documentation/system_administrators/terraform/grid_terraform.md index d1e41767..c29dd9bd 100644 --- a/src/documentation/system_administrators/terraform/grid_terraform.md +++ b/src/documentation/system_administrators/terraform/grid_terraform.md @@ -58,11 +58,11 @@ resource "grid_deployment" "d1" { memory = 2048 entrypoint = "/sbin/zinit init" mounts { - disk_name = "mydisk1" + name = "mydisk1" mount_point = "/opt" } mounts { - disk_name = "mydisk2" + name = "mydisk2" mount_point = "/test" } env_vars = { diff --git a/src/documentation/system_administrators/terraform/resources/terraform_caprover.md b/src/documentation/system_administrators/terraform/resources/terraform_caprover.md index 493653be..909a4ca4 100644 --- a/src/documentation/system_administrators/terraform/resources/terraform_caprover.md +++ b/src/documentation/system_administrators/terraform/resources/terraform_caprover.md @@ -96,11 +96,11 @@ resource "grid_deployment" "d0" { memory = 8192 entrypoint = "/sbin/zinit init" mounts { - disk_name = "data0" + name = "data0" mount_point = "/var/lib/docker" } mounts { - disk_name = "data1" + name = "data1" mount_point = "/captain" } env_vars = { @@ -387,7 +387,7 @@ resource "grid_deployment" "d2" { memory = 2048 entrypoint = "/sbin/zinit init" mounts { - disk_name = "data2" + name = "data2" mount_point = "/var/lib/docker" } env_vars = { diff --git a/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_full_vm.md b/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_full_vm.md index 1ba47299..479c3fbc 100644 --- a/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_full_vm.md +++ b/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_full_vm.md @@ -43,7 +43,7 @@ Let modify the qsfs-on-microVM [example](./terraform_qsfs_on_microvm.md) to depl ```terraform mounts { - disk_name = "rootfs" + name = "rootfs" mount_point = "/" } ``` @@ -160,11 +160,11 @@ resource "grid_deployment" "qsfs" { SSH_KEY = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9MI7fh4xEOOEKL7PvLvXmSeRWesToj6E26bbDASvlZnyzlSKFLuYRpnVjkr8JcuWKZP6RQn8+2aRs6Owyx7Tx+9kmEh7WI5fol0JNDn1D0gjp4XtGnqnON7d0d5oFI+EjQQwgCZwvg0PnV/2DYoH4GJ6KPCclPz4a6eXrblCLA2CHTzghDgyj2x5B4vB3rtoI/GAYYNqxB7REngOG6hct8vdtSndeY1sxuRoBnophf7MPHklRQ6EG2GxQVzAOsBgGHWSJPsXQkxbs8am0C9uEDL+BJuSyFbc/fSRKptU1UmS18kdEjRgGNoQD7D+Maxh1EbmudYqKW92TVgdxXWTQv1b1+3dG5+9g+hIWkbKZCBcfMe4nA5H7qerLvoFWLl6dKhayt1xx5mv8XhXCpEC22/XHxhRBHBaWwSSI+QPOCvs4cdrn4sQU+EXsy7+T7FIXPeWiC2jhFd6j8WIHAv6/rRPsiwV1dobzZOrCxTOnrqPB+756t7ANxuktsVlAZaM= sameh@sameh-inspiron-3576" } mounts { - disk_name = "rootfs" + name = "rootfs" mount_point = "/" } mounts { - disk_name = "qsfs" + name = "qsfs" mount_point = "/qsfs" } } @@ -177,7 +177,7 @@ output "planetary_ip" { } ``` -**note**: the `grid_deployment.qsfs.name` should be the same as the qsfs disk name in `grid_deployment.vms.mounts.disk_name`. +**note**: the `grid_deployment.qsfs.name` should be the same as the qsfs disk name in `grid_deployment.vms.mounts.name`. diff --git a/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_microvm.md b/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_microvm.md index 35d18ffd..3811cbfa 100644 --- a/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_microvm.md +++ b/src/documentation/system_administrators/terraform/resources/terraform_qsfs_on_microvm.md @@ -246,7 +246,7 @@ resource "grid_deployment" "qsfs" { SSH_KEY = var.SSH_KEY } mounts { - disk_name = "qsfs" + name = "qsfs" mount_point = "/qsfs" } } diff --git a/src/documentation/system_administrators/terraform/terraform_basic_example.md b/src/documentation/system_administrators/terraform/terraform_basic_example.md index 60c1fca4..b89af6ef 100644 --- a/src/documentation/system_administrators/terraform/terraform_basic_example.md +++ b/src/documentation/system_administrators/terraform/terraform_basic_example.md @@ -28,11 +28,11 @@ resource "grid_deployment" "d1" { memory = 1024 entrypoint = "/sbin/zinit init" mounts { - disk_name = "mydisk1" + name = "mydisk1" mount_point = "/opt" } mounts { - disk_name = "mydisk2" + name = "mydisk2" mount_point = "/test" } env_vars = { diff --git a/src/documentation/system_administrators/terraform/terraform_full_vm.md b/src/documentation/system_administrators/terraform/terraform_full_vm.md index ea2fdc57..b2cf1536 100644 --- a/src/documentation/system_administrators/terraform/terraform_full_vm.md +++ b/src/documentation/system_administrators/terraform/terraform_full_vm.md @@ -162,7 +162,7 @@ resource "grid_deployment" "d1" { flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist" cpu = var.cpu mounts { - disk_name = "disk1" + name = "disk1" mount_point = "/disk1" } memory = var.memory