@@ -74,6 +74,7 @@ resource "azurerm_storage_container" "storcont" {
74
74
# -------------------------------------------------------------
75
75
76
76
resource "random_password" "main" {
77
+ count = var. admin_password == null ? 1 : 0
77
78
length = var. random_password_length
78
79
min_upper = 4
79
80
min_lower = 2
@@ -91,7 +92,7 @@ resource "azurerm_sql_server" "primary" {
91
92
location = local. location
92
93
version = " 12.0"
93
94
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
95
96
tags = merge ({ " Name" = format (" %s-primary" , var. sqlserver_name ) }, var. tags , )
96
97
97
98
dynamic "identity" {
@@ -118,8 +119,8 @@ resource "azurerm_sql_server" "secondary" {
118
119
resource_group_name = local. resource_group_name
119
120
location = var. secondary_sql_server_location
120
121
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
123
124
tags = merge ({ " Name" = format (" %s-secondary" , var. sqlserver_name ) }, var. tags , )
124
125
125
126
dynamic "identity" {
0 commit comments