Skip to content

Commit 6fcc90a

Browse files
bhlohumibhlohumi
committed
Automation Toolkit Release v11
1 parent b946e68 commit 6fcc90a

File tree

58 files changed

+1283
-1283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1283
-1283
lines changed

‎cd3_automation_toolkit/user-scripts/terraform/adb.tf

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
data "oci_core_subnets" "oci_subnets_adb" {
88
# depends_on = [module.subnets] # Uncomment to create Network and FSS together
99
#for_each = var.adb != null ? var.adb : {}
10-
for_each = { for k,v in var.adb : k =>v if v.vcn_name !=null }
10+
for_each = { for k, v in var.adb : k => v if v.vcn_name != null }
1111
compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : var.compartment_ocids[each.value.network_compartment_id]
1212
display_name = each.value.subnet_id
1313
vcn_id = data.oci_core_vcns.oci_vcns_adb[each.key].virtual_networks.*.id[0]
@@ -16,7 +16,7 @@ data "oci_core_subnets" "oci_subnets_adb" {
1616
data "oci_core_vcns" "oci_vcns_adb" {
1717
# depends_on = [module.vcns] # Uncomment to create Network and FSS together
1818
#for_each = var.adb != null ? var.adb : {}
19-
for_each = { for k,v in var.adb : k =>v if v.vcn_name !=null }
19+
for_each = { for k, v in var.adb : k => v if v.vcn_name != null }
2020
compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : var.compartment_ocids[each.value.network_compartment_id]
2121
display_name = each.value.vcn_name
2222
}
@@ -25,25 +25,25 @@ module "adb" {
2525
source = "./modules/database/adb"
2626
for_each = var.adb != null ? var.adb : {}
2727
# depends_on = [module.vcns, module.subnets]
28-
admin_password = each.value.admin_password
29-
character_set = each.value.character_set
30-
compartment_id = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : null
31-
cpu_core_count = each.value.cpu_core_count
32-
database_edition = each.value.database_edition
33-
data_storage_size_in_tbs = each.value.data_storage_size_in_tbs
34-
db_name = each.value.db_name
35-
db_version = each.value.db_version
36-
db_workload = each.value.db_workload
37-
defined_tags = each.value.defined_tags
38-
display_name = each.value.display_name
39-
license_model = each.value.license_model
40-
ncharacter_set = each.value.ncharacter_set
41-
network_compartment_id= each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : null
28+
admin_password = each.value.admin_password
29+
character_set = each.value.character_set
30+
compartment_id = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : null
31+
cpu_core_count = each.value.cpu_core_count
32+
database_edition = each.value.database_edition
33+
data_storage_size_in_tbs = each.value.data_storage_size_in_tbs
34+
db_name = each.value.db_name
35+
db_version = each.value.db_version
36+
db_workload = each.value.db_workload
37+
defined_tags = each.value.defined_tags
38+
display_name = each.value.display_name
39+
license_model = each.value.license_model
40+
ncharacter_set = each.value.ncharacter_set
41+
network_compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : null
4242
network_security_group_ids = each.value.nsg_ids
43-
freeform_tags = each.value.freeform_tags
44-
subnet_id = each.value.subnet_id != null ? (length(regexall("ocid1.subnet.oc1*", each.value.subnet_id)) > 0 ? each.value.subnet_id : data.oci_core_subnets.oci_subnets_adb[each.key].subnets.*.id[0]): null
45-
vcn_name = each.value.vcn_name != null ? each.value.vcn_name : null
46-
whitelisted_ips = each.value.whitelisted_ips
43+
freeform_tags = each.value.freeform_tags
44+
subnet_id = each.value.subnet_id != null ? (length(regexall("ocid1.subnet.oc1*", each.value.subnet_id)) > 0 ? each.value.subnet_id : data.oci_core_subnets.oci_subnets_adb[each.key].subnets.*.id[0]) : null
45+
vcn_name = each.value.vcn_name != null ? each.value.vcn_name : null
46+
whitelisted_ips = each.value.whitelisted_ips
4747

4848
#Optional parameters for ADB
4949
# are_primary_whitelisted_ips_used = var.autonomous_database_are_primary_whitelisted_ips_used
@@ -54,7 +54,7 @@ module "adb" {
5454
# clone_type = var.autonomous_database_clone_type
5555
# customer_contacts {
5656

57-
#Optional
57+
#Optional
5858
# email = var.autonomous_database_customer_contacts_email
5959
# }
6060
# data_safe_status = var.autonomous_database_data_safe_status

‎cd3_automation_toolkit/user-scripts/terraform/cloud-guard.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ module "cloud-guard-targets" {
3030
target_resource_id = each.value.target_resource_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.target_resource_id)) > 0 ? each.value.target_resource_id : var.compartment_ocids[each.value.target_resource_id]) : each.value.target_resource_id
3131
target_resource_type = each.value.target_resource_type != null ? each.value.target_resource_type : "COMPARTMENT"
3232
prefix = each.value.prefix
33-
33+
3434
#Optional
3535
defined_tags = each.value.defined_tags
3636
description = each.value.description

‎cd3_automation_toolkit/user-scripts/terraform/database-exacs.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ module "exa-vmclusters" {
6969
gi_version = each.value.gi_version
7070
hostname = each.value.hostname
7171
#ssh_public_keys = length(regexall("ssh-rsa*",each.value.ssh_public_key)) > 0 ? each.value.ssh_public_key : var.ssh_public_key
72-
ssh_public_keys = lookup(var.exacs_ssh_keys, each.value.ssh_public_keys, var.exacs_ssh_keys["ssh_public_key"])
73-
// cluster_subnet_id = length(regexall("ocid1.subnet.oc1*", each.value.cluster_subnet_id)) > 0 ? each.value.cluster_subnet_id : merge(module.subnets.*...)[each.value.cluster_subnet_id]["subnet_tf_id"]
72+
ssh_public_keys = lookup(var.exacs_ssh_keys, each.value.ssh_public_keys, var.exacs_ssh_keys["ssh_public_key"])
73+
// cluster_subnet_id = length(regexall("ocid1.subnet.oc1*", each.value.cluster_subnet_id)) > 0 ? each.value.cluster_subnet_id : merge(module.subnets.*...)[each.value.cluster_subnet_id]["subnet_tf_id"]
7474
network_compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : null
7575
vcn_names = [each.value.vcn_name]
7676
cluster_subnet_id = each.value.cluster_subnet_id != "" ? (length(regexall("ocid1.subnet.oc1*", each.value.cluster_subnet_id)) > 0 ? each.value.cluster_subnet_id : data.oci_core_subnets.oci_exacs_subnets[each.key].subnets.*.id[0]) : null
@@ -83,10 +83,10 @@ module "exa-vmclusters" {
8383
is_local_backup_enabled = each.value.is_local_backup_enabled
8484
is_sparse_diskgroup_enabled = each.value.is_sparse_diskgroup_enabled
8585
license_model = each.value.license_model
86-
// nsg_ids = each.value.nsg_ids != null ? [for nsg in each.value.nsg_ids : length(regexall("ocid1.networksecuritygroup.oc1*", nsg)) > 0 ? nsg : merge(module.nsgs.*...)[nsg]["nsg_tf_id"]] : null
87-
nsg_ids = each.value.nsg_ids != null ? each.value.nsg_ids : []
88-
ocpu_count = each.value.ocpu_count
89-
scan_listener_port_tcp = each.value.scan_listener_port_tcp
90-
scan_listener_port_tcp_ssl = each.value.scan_listener_port_tcp_ssl
91-
time_zone = each.value.time_zone
86+
// nsg_ids = each.value.nsg_ids != null ? [for nsg in each.value.nsg_ids : length(regexall("ocid1.networksecuritygroup.oc1*", nsg)) > 0 ? nsg : merge(module.nsgs.*...)[nsg]["nsg_tf_id"]] : null
87+
nsg_ids = each.value.nsg_ids != null ? each.value.nsg_ids : []
88+
ocpu_count = each.value.ocpu_count
89+
scan_listener_port_tcp = each.value.scan_listener_port_tcp
90+
scan_listener_port_tcp_ssl = each.value.scan_listener_port_tcp_ssl
91+
time_zone = each.value.time_zone
9292
}

‎cd3_automation_toolkit/user-scripts/terraform/dbsystem-vm-bm.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ module "dbsystems-vm-bm" {
3131
cluster_name = each.value.cluster_name
3232
shape = each.value.shape
3333
#ssh_public_key = length(regexall("ssh-rsa*",each.value.ssh_public_key)) > 0 ? each.value.ssh_public_key : var.ssh_public_key
34-
ssh_public_keys = lookup(var.dbsystem_ssh_keys, each.value.ssh_public_keys, var.dbsystem_ssh_keys["ssh_public_key"])
35-
network_compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : null
36-
vcn_names = [each.value.vcn_name]
37-
subnet_id = each.value.subnet_id != "" ? (length(regexall("ocid1.subnet.oc1*", each.value.subnet_id)) > 0 ? each.value.subnet_id : data.oci_core_subnets.oci_dbsystems_subnets[each.key].subnets.*.id[0]) : null
38-
node_count = each.value.node_count
39-
nsg_ids = each.value.nsg_ids != null ? each.value.nsg_ids : []
34+
ssh_public_keys = lookup(var.dbsystem_ssh_keys, each.value.ssh_public_keys, var.dbsystem_ssh_keys["ssh_public_key"])
35+
network_compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : null
36+
vcn_names = [each.value.vcn_name]
37+
subnet_id = each.value.subnet_id != "" ? (length(regexall("ocid1.subnet.oc1*", each.value.subnet_id)) > 0 ? each.value.subnet_id : data.oci_core_subnets.oci_dbsystems_subnets[each.key].subnets.*.id[0]) : null
38+
node_count = each.value.node_count
39+
nsg_ids = each.value.nsg_ids != null ? each.value.nsg_ids : []
4040

4141
time_zone = each.value.time_zone
4242
cpu_core_count = each.value.cpu_core_count

0 commit comments

Comments
 (0)