From 4446dd165901017b3e04f81aaf473548bf2bbbbf Mon Sep 17 00:00:00 2001
From: Sasikanth Eda <sasikeda@users.noreply.github.com>
Date: Sat, 23 Mar 2024 13:40:46 +0530
Subject: [PATCH] Azure use lun path instead of device paths (#497)

* Add devdiscover to act on lun ids

* Make the lun index from zero
---
 .../sub_modules/instance_template/locals.tf   |  4 +--
 .../vm_multiple_disk/vm_multiple_disk.tf      | 29 ++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/azure_scale_templates/sub_modules/instance_template/locals.tf b/azure_scale_templates/sub_modules/instance_template/locals.tf
index 53f49739..defbfdb6 100644
--- a/azure_scale_templates/sub_modules/instance_template/locals.tf
+++ b/azure_scale_templates/sub_modules/instance_template/locals.tf
@@ -241,7 +241,7 @@ locals {
         disk["name"] => {
           fs_name     = disk["fs_name"]
           pool        = disk["pool"]
-          device_name = element(local.block_device_names, jdx)
+          device_name = format("disk/azure/scsi1/lun%s", jdx)
         }
       })
     }
@@ -322,7 +322,7 @@ locals {
         disk["name"] => {
           fs_name     = disk["fs_name"]
           pool        = disk["pool"]
-          device_name = element(local.block_device_names, jdx)
+          device_name = "disk/azure/scsi1/lun0"
         }
       })
     }
diff --git a/resources/azure/compute/vm_multiple_disk/vm_multiple_disk.tf b/resources/azure/compute/vm_multiple_disk/vm_multiple_disk.tf
index 568d4c08..701d2ba5 100644
--- a/resources/azure/compute/vm_multiple_disk/vm_multiple_disk.tf
+++ b/resources/azure/compute/vm_multiple_disk/vm_multiple_disk.tf
@@ -34,10 +34,21 @@ systemctl restart NetworkManager
 EOF
 }
 
-# Gets Azure ssh keypair data
-data "azurerm_ssh_public_key" "itself" {
-  name                = var.user_key_pair
-  resource_group_name = var.resource_group_name
+data "template_file" "lun_discover" {
+  template = <<EOF
+#!/usr/bin/env bash
+if [ ! -d "/var/mmfs/etc" ]; then
+   mkdir -p "/var/mmfs/etc"
+fi
+echo "#!/bin/ksh" > "/var/mmfs/etc/nsddevices"
+echo "# Generated by IBM Storage Scale deployment." >> "/var/mmfs/etc/nsddevices"
+%{for i in range(0, 17)~}
+echo "echo \"disk/azure/scsi1/lun${i} generic\"" >> "/var/mmfs/etc/nsddevices"
+%{endfor~}
+echo "# Bypass the NSD device discovery" >> "/var/mmfs/etc/nsddevices"
+echo "return 0" >> "/var/mmfs/etc/nsddevices"
+chmod u+x "/var/mmfs/etc/nsddevices"
+EOF
 }
 
 data "template_cloudinit_config" "user_data64" {
@@ -47,6 +58,16 @@ data "template_cloudinit_config" "user_data64" {
     content_type = "text/x-shellscript"
     content      = data.template_file.user_data.rendered
   }
+  part {
+    content_type = "text/x-shellscript"
+    content      = data.template_file.lun_discover.rendered
+  }
+}
+
+# Gets Azure ssh keypair data
+data "azurerm_ssh_public_key" "itself" {
+  name                = var.user_key_pair
+  resource_group_name = var.resource_group_name
 }
 
 resource "azurerm_network_interface" "itself" {