test

linux-common/main.tf

@@ -34,7 +34,7 @@ resource "null_resource" "files" {
             host     = var.private_ip_address
             user     = var.admin_username
             password = var.admin_password
-            timeout  = "60s"
+            timeout  = "10m"
             #private_key = "${file("~/.ssh/id_rsa")}"   
         }
         source      = "${path.module}/${var.os_type}/common"
@@ -54,7 +54,7 @@ resource "null_resource" "post-linux-vm" {
             host     = var.private_ip_address
             user     = var.admin_username
             password = var.admin_password
-            timeout  = "60s"
+            timeout  = "3m"
             #private_key = "${file("~/.ssh/id_rsa")}"
         }
 
@@ -83,7 +83,7 @@ resource "null_resource" "update" {
             host     = var.private_ip_address
             user     = var.admin_username
             password = var.admin_password
-            timeout  = "60s"
+            timeout  = "3m"
             #private_key = "${file("~/.ssh/id_rsa")}"
         }
 
@@ -109,7 +109,7 @@ resource "null_resource" "resize" {
             host     = var.private_ip_address
             user     = var.admin_username
             password = var.admin_password
-            timeout  = "60s"
+            timeout  = "3m"
             #private_key = "${file("~/.ssh/id_rsa")}"
         }
 

vm-fromsnapshot-linux/main.tf

@@ -119,6 +119,8 @@ resource "azurerm_virtual_machine" "vm" {
 
 module "linux-common" {
 
+  count = var.initial_password != null? 1 : 0
+  
   source = "git::https://gitlab.com/qmi/qmi-cloud-tf-modules.git//linux-common"
 
   depends_on = [