Compare commits

...

8 Commits

Author SHA1 Message Date
caff317c3f fix example 2024-10-05 09:41:28 +08:00
af3343e56f bump azurerm to v3 2024-10-05 09:33:39 +08:00
8c3f290e61 bump azurerm to v3 2024-10-04 10:44:16 +08:00
3a6dd12ab9 bump azurerm to v3 2024-10-04 10:19:03 +08:00
5192273700 try to fix example 2024-10-04 09:45:52 +08:00
d2e47ddadd add issue ref 2024-10-04 09:45:52 +08:00
96d88c3c41 try to fix example 2024-10-04 09:45:52 +08:00
e405273660 bump azurerm to v3 2024-10-04 09:45:52 +08:00
7 changed files with 30 additions and 14 deletions

View File

@ -40,4 +40,13 @@ resource "azurerm_attestation_provider" "corp_attestation" {
name = "${var.attestation_provider_name}${random_string.attestation_suffix.result}" name = "${var.attestation_provider_name}${random_string.attestation_suffix.result}"
resource_group_name = azurerm_resource_group.rg.name resource_group_name = azurerm_resource_group.rg.name
policy_signing_certificate_data = try(tls_self_signed_cert.attestation[0].cert_pem, file(var.cert_path)) policy_signing_certificate_data = try(tls_self_signed_cert.attestation[0].cert_pem, file(var.cert_path))
#https://github.com/hashicorp/terraform-provider-azurerm/issues/21998#issuecomment-1573312297
lifecycle {
ignore_changes = [
"open_enclave_policy_base64",
"sev_snp_policy_base64",
"sgx_enclave_policy_base64",
"tpm_policy_base64",
]
}
} }

View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
azurerm = { azurerm = {
source = "hashicorp/azurerm" source = "hashicorp/azurerm"
version = "~>2.0" version = "~>3.0"
} }
random = { random = {
source = "hashicorp/random" source = "hashicorp/random"

View File

@ -3,7 +3,7 @@ terraform {
required_providers { required_providers {
azurerm = { azurerm = {
source = "hashicorp/azurerm" source = "hashicorp/azurerm"
version = "~>2.0" version = "~>3.0"
} }
random = { random = {
source = "hashicorp/random" source = "hashicorp/random"

View File

@ -8,7 +8,7 @@ terraform {
} }
azurerm = { azurerm = {
source = "hashicorp/azurerm" source = "hashicorp/azurerm"
version = "~>2.0" version = "~>3.0"
} }
random = { random = {
source = "hashicorp/random" source = "hashicorp/random"

View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
azurerm = { azurerm = {
source = "hashicorp/azurerm" source = "hashicorp/azurerm"
version = "~>2.0" version = "~>3.0"
} }
} }
} }
@ -17,6 +17,15 @@ provider "azurerm" {
} }
} }
resource "random_password" "password" {
count = var.admin_password == null ? 1 : 0
length = 20
}
locals {
admin_password = try(random_password.password[0].result, var.admin_password)
}
resource "azurerm_resource_group" "vmss" { resource "azurerm_resource_group" "vmss" {
name = var.resource_group_name name = var.resource_group_name
location = var.location location = var.location
@ -27,7 +36,7 @@ resource "random_string" "fqdn" {
length = 6 length = 6
special = false special = false
upper = false upper = false
number = false numeric = false
} }
resource "azurerm_virtual_network" "vmss" { resource "azurerm_virtual_network" "vmss" {
@ -73,14 +82,12 @@ resource "azurerm_lb_backend_address_pool" "bpepool" {
} }
resource "azurerm_lb_probe" "vmss" { resource "azurerm_lb_probe" "vmss" {
resource_group_name = azurerm_resource_group.vmss.name
loadbalancer_id = azurerm_lb.vmss.id loadbalancer_id = azurerm_lb.vmss.id
name = "ssh-running-probe" name = "ssh-running-probe"
port = var.application_port port = var.application_port
} }
resource "azurerm_lb_rule" "lbnatrule" { resource "azurerm_lb_rule" "lbnatrule" {
resource_group_name = azurerm_resource_group.vmss.name
loadbalancer_id = azurerm_lb.vmss.id loadbalancer_id = azurerm_lb.vmss.id
name = "http" name = "http"
protocol = "Tcp" protocol = "Tcp"
@ -127,7 +134,7 @@ resource "azurerm_virtual_machine_scale_set" "vmss" {
os_profile { os_profile {
computer_name_prefix = "vmlab" computer_name_prefix = "vmlab"
admin_username = var.admin_user admin_username = var.admin_user
admin_password = var.admin_password admin_password = local.admin_password
custom_data = file("web.conf") custom_data = file("web.conf")
} }
@ -198,7 +205,7 @@ resource "azurerm_virtual_machine" "jumpbox" {
os_profile { os_profile {
computer_name = "jumpbox" computer_name = "jumpbox"
admin_username = var.admin_user admin_username = var.admin_user
admin_password = var.admin_password admin_password = local.admin_password
} }
os_profile_linux_config { os_profile_linux_config {

View File

@ -28,6 +28,6 @@ variable "admin_user" {
variable "admin_password" { variable "admin_password" {
description = "Default password for admin account" description = "Default password for admin account"
default = "ChangeMe123!" default = null
sensitive = true sensitive = true
} }