Skip to content

Commit c4aebea

Browse files
hyderDjelibeybi
authored andcommitted
duplicate variables definition for availability_domains
Signed-off-by: Ali Mukadam <[email protected]>
1 parent 7f0fa38 commit c4aebea

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

examples/db/modules/db/db.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ resource "oci_database_db_system" "test_db_system" {
5454
freeform_tags = {
5555
"Department" = "Finance"
5656
}
57-
}
57+
}

examples/db/modules/db/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ variable "db_config" {
6464
node_count = number
6565
data_storage_percentage = number
6666
})
67-
}
67+
}

examples/db/variables.tf

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -246,24 +246,14 @@ variable "admin_use_autonomous" {
246246
type = bool
247247
}
248248

249-
# availability domains
250-
variable "availability_domains" {
251-
description = "ADs where to provision non-OKE resources"
252-
default = {
253-
bastion = 1
254-
admin = 1
255-
}
256-
type = map
257-
}
258-
259249
# availability domains
260250
variable "availability_domains" {
261251
description = "ADs where to provision compute resources"
262-
type = "map"
252+
type = map
263253

264254
default = {
265255
bastion = 1
266-
db = 1
256+
db = 1
267257
}
268258
}
269259

@@ -272,76 +262,95 @@ variable "availability_domains" {
272262
variable "db_system_shape" {
273263
description = "compute shape of db nodes"
274264
default = "VM.Standard2.8"
265+
type = string
275266
}
276267

277268
variable "cpu_core_count" {
278269
default = "2"
270+
type = number
279271
}
280272

281273
variable "db_edition" {
282274
default = "ENTERPRISE_EDITION"
275+
type = string
283276
}
284277

285278
variable "db_admin_password" {
286279
default = "BEstrO0ng_#12"
280+
type = string
287281
}
288282

289283
variable "db_name" {
290284
default = "basedb"
285+
type = string
291286
}
292287

293288
variable "db_home_db_name" {
294289
default = "basedb2"
290+
type = string
295291
}
296292

297293
variable "db_version" {
298294
default = "19.0.0.0"
295+
type = string
299296
}
300297

301298
variable "db_home_display_name" {
302299
default = "basedbhome"
300+
type = string
303301
}
304302

305303
variable "db_disk_redundancy" {
306304
default = "HIGH"
305+
type = string
307306
}
308307

309308
variable "db_system_display_name" {
310309
default = "basedb_system"
310+
type = string
311311
}
312312

313313
variable "hostname" {
314314
default = "myoracledb"
315+
type = string
315316
}
316317

317318
variable "n_character_set" {
318319
default = "AL16UTF16"
320+
type = string
319321
}
320322

321323
variable "character_set" {
322324
default = "AL32UTF8"
325+
type = string
323326
}
324327

325328
variable "db_workload" {
326329
default = "OLTP"
330+
type = string
327331
}
328332

329333
variable "pdb_name" {
330334
default = "pdb1"
335+
type = string
331336
}
332337

333338
variable "data_storage_size_in_gb" {
334-
default = "256"
339+
default = 256
340+
type = number
335341
}
336342

337343
variable "license_model" {
338344
default = "LICENSE_INCLUDED"
345+
type = string
339346
}
340347

341348
variable "node_count" {
342-
default = "1"
349+
default = 1
350+
type = number
343351
}
344352

345353
variable "data_storage_percentage" {
346-
default = "40"
347-
}
354+
default = 40
355+
type = number
356+
}

0 commit comments

Comments
 (0)