From 19be82a64d8e4d9b99ebd9474030018247daf854 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Tue, 8 Oct 2024 18:32:03 +0100 Subject: [PATCH 1/4] Update Azure NFS role with nfs domain output Signed-off-by: Jim Enright --- modules/terraform-azure-nfs/files/mount_nfs_on_vm.sh.tpl | 3 ++- modules/terraform-azure-nfs/outputs.tf | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/terraform-azure-nfs/files/mount_nfs_on_vm.sh.tpl b/modules/terraform-azure-nfs/files/mount_nfs_on_vm.sh.tpl index fd1d16d..c1866bf 100644 --- a/modules/terraform-azure-nfs/files/mount_nfs_on_vm.sh.tpl +++ b/modules/terraform-azure-nfs/files/mount_nfs_on_vm.sh.tpl @@ -3,4 +3,5 @@ apt-get -y update apt-get -y install nfs-common mkdir -p /mount/${nfs_storage_account_name}/${nfs_file_share_name} -mount -t nfs ${nfs_storage_account_name}.file.core.windows.net:/${nfs_storage_account_name}/${nfs_file_share_name} /mount/${nfs_storage_account_name}/${nfs_file_share_name} -o vers=4,minorversion=1,sec=sys \ No newline at end of file +mount -t nfs ${nfs_storage_account_name}.file.core.windows.net:/${nfs_storage_account_name}/${nfs_file_share_name} /mount/${nfs_storage_account_name}/${nfs_file_share_name} -o vers=4,minorversion=1,sec=sys +chown 8536:8536 /mount/${nfs_storage_account_name}/${nfs_file_share_name} \ No newline at end of file diff --git a/modules/terraform-azure-nfs/outputs.tf b/modules/terraform-azure-nfs/outputs.tf index 2d7172f..970b00a 100644 --- a/modules/terraform-azure-nfs/outputs.tf +++ b/modules/terraform-azure-nfs/outputs.tf @@ -18,6 +18,12 @@ output "nfs_file_share_url" { description = "NFS File Share url" } +output "nfs_file_share_nfs_domain_url" { + value = "nfs://${var.nfs_storage_account_name}.file.core.windows.net}/${var.nfs_storage_account_name}/${var.nfs_file_share_name}" + + description = "NFS File Share domain with nfs protocol prefix" +} + output "nfs_storage_account_name" { value = azurerm_storage_account.nfs_storage_account.name description = "NFS Storage Account Name" From 82ad7fec07aad2cfb81d4552dd635785655eaa4b Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Tue, 8 Oct 2024 18:52:28 +0100 Subject: [PATCH 2/4] Fix typo in NFS domain output Signed-off-by: Jim Enright --- modules/terraform-azure-nfs/outputs.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/terraform-azure-nfs/outputs.tf b/modules/terraform-azure-nfs/outputs.tf index 970b00a..5dbf48f 100644 --- a/modules/terraform-azure-nfs/outputs.tf +++ b/modules/terraform-azure-nfs/outputs.tf @@ -19,11 +19,12 @@ output "nfs_file_share_url" { } output "nfs_file_share_nfs_domain_url" { - value = "nfs://${var.nfs_storage_account_name}.file.core.windows.net}/${var.nfs_storage_account_name}/${var.nfs_file_share_name}" + value = "nfs://${var.nfs_storage_account_name}.file.core.windows.net/${var.nfs_storage_account_name}/${var.nfs_file_share_name}" description = "NFS File Share domain with nfs protocol prefix" } + output "nfs_storage_account_name" { value = azurerm_storage_account.nfs_storage_account.name description = "NFS Storage Account Name" From 5f1af7d5379687d65a1b8cc986a847dae76813e2 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Tue, 8 Oct 2024 20:16:44 +0100 Subject: [PATCH 3/4] Update azure nfs output variable Signed-off-by: Jim Enright --- modules/terraform-azure-nfs/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/terraform-azure-nfs/outputs.tf b/modules/terraform-azure-nfs/outputs.tf index 5dbf48f..1fa5528 100644 --- a/modules/terraform-azure-nfs/outputs.tf +++ b/modules/terraform-azure-nfs/outputs.tf @@ -19,7 +19,7 @@ output "nfs_file_share_url" { } output "nfs_file_share_nfs_domain_url" { - value = "nfs://${var.nfs_storage_account_name}.file.core.windows.net/${var.nfs_storage_account_name}/${var.nfs_file_share_name}" + value = "nfs://${var.nfs_storage_account_name}.file.core.windows.net:/${var.nfs_storage_account_name}/${var.nfs_file_share_name}" description = "NFS File Share domain with nfs protocol prefix" } From e9f7b3c367861ba09a9c515c66f3e79705d07794 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Wed, 9 Oct 2024 11:28:51 +0100 Subject: [PATCH 4/4] Fix tflint and readme in azure nfs module Signed-off-by: Jim Enright --- modules/terraform-azure-nfs/README.md | 1 + modules/terraform-azure-nfs/outputs.tf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/terraform-azure-nfs/README.md b/modules/terraform-azure-nfs/README.md index 0f7ab99..eaf18d3 100644 --- a/modules/terraform-azure-nfs/README.md +++ b/modules/terraform-azure-nfs/README.md @@ -79,6 +79,7 @@ No modules. | Name | Description | |------|-------------| +| [nfs\_file\_share\_nfs\_domain\_url](#output\_nfs\_file\_share\_nfs\_domain\_url) | NFS File Share domain with nfs protocol prefix | | [nfs\_file\_share\_url](#output\_nfs\_file\_share\_url) | NFS File Share url | | [nfs\_storage\_account\_name](#output\_nfs\_storage\_account\_name) | NFS Storage Account Name | | [nfs\_vm\_mount\_path](#output\_nfs\_vm\_mount\_path) | Path where NFS is mounted on the VM | diff --git a/modules/terraform-azure-nfs/outputs.tf b/modules/terraform-azure-nfs/outputs.tf index 1fa5528..3b98f3d 100644 --- a/modules/terraform-azure-nfs/outputs.tf +++ b/modules/terraform-azure-nfs/outputs.tf @@ -19,7 +19,7 @@ output "nfs_file_share_url" { } output "nfs_file_share_nfs_domain_url" { - value = "nfs://${var.nfs_storage_account_name}.file.core.windows.net:/${var.nfs_storage_account_name}/${var.nfs_file_share_name}" + value = "nfs://${var.nfs_storage_account_name}.file.core.windows.net:/${var.nfs_storage_account_name}/${var.nfs_file_share_name}" description = "NFS File Share domain with nfs protocol prefix" }