From 14fb967644bfb3e45a833da7db7287d53fafc459 Mon Sep 17 00:00:00 2001 From: Manuel Romero Date: Thu, 16 Jan 2025 14:18:47 +0100 Subject: [PATCH] test --- linux-common/main.tf | 8 ++++---- vm-fromsnapshot-linux/main.tf | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/linux-common/main.tf b/linux-common/main.tf index dd5ca5a..a281b59 100644 --- a/linux-common/main.tf +++ b/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")}" } diff --git a/vm-fromsnapshot-linux/main.tf b/vm-fromsnapshot-linux/main.tf index 51536dd..409f0ba 100644 --- a/vm-fromsnapshot-linux/main.tf +++ b/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 = [