@@ -74,6 +74,7 @@ resource "azurerm_storage_container" "storcont" {
7474# -------------------------------------------------------------
7575
7676resource "random_password" "main" {
77+ count = var. admin_password == null ? 1 : 0
7778 length = var. random_password_length
7879 min_upper = 4
7980 min_lower = 2
@@ -91,7 +92,7 @@ resource "azurerm_sql_server" "primary" {
9192 location = local. location
9293 version = " 12.0"
9394 administrator_login = var. admin_username == null ? " sqladmin" : var. admin_username
94- administrator_login_password = var. admin_password == null ? random_password. main . result : var. admin_password
95+ administrator_login_password = var. admin_password == null ? random_password. main . 0 . result : var. admin_password
9596 tags = merge ({ " Name" = format (" %s-primary" , var. sqlserver_name ) }, var. tags , )
9697
9798 dynamic "identity" {
@@ -118,8 +119,8 @@ resource "azurerm_sql_server" "secondary" {
118119 resource_group_name = local. resource_group_name
119120 location = var. secondary_sql_server_location
120121 version = " 12.0"
121- administrator_login = " sqladmin"
122- administrator_login_password = var. admin_password == null ? random_password. main . result : var. admin_password
122+ administrator_login = var . admin_username == null ? " sqladmin" : var . admin_username
123+ administrator_login_password = var. admin_password == null ? random_password. main . 0 . result : var. admin_password
123124 tags = merge ({ " Name" = format (" %s-secondary" , var. sqlserver_name ) }, var. tags , )
124125
125126 dynamic "identity" {
0 commit comments