diff --git a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf index 596e369135d..b2d6c765a34 100644 --- a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf +++ b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf @@ -11,13 +11,6 @@ locals { } } - baseline_ssm_parameters = { - "/oracle/database/PPIWFM" = { - parameters = { - passwords = { description = "database passwords" } - } - } - } baseline_secretsmanager_secrets = { "/oracle/database/PPIWFM" = { secrets = { diff --git a/terraform/environments/hmpps-domain-services/locals_test.tf b/terraform/environments/hmpps-domain-services/locals_test.tf index 8fa88839a81..ee665ce598d 100644 --- a/terraform/environments/hmpps-domain-services/locals_test.tf +++ b/terraform/environments/hmpps-domain-services/locals_test.tf @@ -4,13 +4,6 @@ locals { # baseline config test_config = { - baseline_ssm_parameters = { - "/join_domain_linux_service_account" = { - parameters = { - passwords = {} - } - } - } baseline_secretsmanager_secrets = { "/join_domain_linux_service_account" = { secrets = { diff --git a/terraform/environments/hmpps-oem/locals_oem.tf b/terraform/environments/hmpps-oem/locals_oem.tf index 288ae1ef196..2a35b074e18 100644 --- a/terraform/environments/hmpps-oem/locals_oem.tf +++ b/terraform/environments/hmpps-oem/locals_oem.tf @@ -53,12 +53,6 @@ locals { } } - oem_ssm_parameters_passwords = { - parameters = { - passwords = {} - } - } - oem_ec2_default = { autoscaling_group = module.baseline_presets.ec2_autoscaling_group.default diff --git a/terraform/environments/hmpps-oem/locals_preproduction.tf b/terraform/environments/hmpps-oem/locals_preproduction.tf index a6b644cb9df..58ef9e09218 100644 --- a/terraform/environments/hmpps-oem/locals_preproduction.tf +++ b/terraform/environments/hmpps-oem/locals_preproduction.tf @@ -10,12 +10,6 @@ locals { "/oracle/database/PPRCVCAT" = local.oem_secretsmanager_secrets } - baseline_ssm_parameters = { - "/oracle/oem" = local.oem_ssm_parameters_passwords - "/oracle/database/EMREP" = local.oem_ssm_parameters_passwords - "/oracle/database/PPRCVCAT" = local.oem_ssm_parameters_passwords - } - baseline_ec2_instances = { preprod-oem-a = merge(local.oem_ec2_default, { config = merge(local.oem_ec2_default.config, { diff --git a/terraform/environments/hmpps-oem/locals_production.tf b/terraform/environments/hmpps-oem/locals_production.tf index 635eba41672..5195b4ca237 100644 --- a/terraform/environments/hmpps-oem/locals_production.tf +++ b/terraform/environments/hmpps-oem/locals_production.tf @@ -10,12 +10,6 @@ locals { "/oracle/database/PRCVCAT" = local.oem_secretsmanager_secrets } - baseline_ssm_parameters = { - "/oracle/oem" = local.oem_ssm_parameters_passwords - "/oracle/database/EMREP" = local.oem_ssm_parameters_passwords - "/oracle/database/PRCVCAT" = local.oem_ssm_parameters_passwords - } - baseline_ec2_instances = { prod-oem-a = merge(local.oem_ec2_default, { config = merge(local.oem_ec2_default.config, { diff --git a/terraform/environments/hmpps-oem/locals_test.tf b/terraform/environments/hmpps-oem/locals_test.tf index 55311b72155..76e0d4ec8be 100644 --- a/terraform/environments/hmpps-oem/locals_test.tf +++ b/terraform/environments/hmpps-oem/locals_test.tf @@ -10,12 +10,6 @@ locals { "/oracle/database/TRCVCAT" = local.oem_secretsmanager_secrets } - baseline_ssm_parameters = { - "/oracle/oem" = local.oem_ssm_parameters_passwords - "/oracle/database/EMREP" = local.oem_ssm_parameters_passwords - "/oracle/database/TRCVCAT" = local.oem_ssm_parameters_passwords - } - baseline_ec2_autoscaling_groups = { test-oem = merge(local.oem_ec2_default, { autoscaling_group = merge(local.oem_ec2_default.autoscaling_group, { diff --git a/terraform/environments/nomis-combined-reporting/locals_test.tf b/terraform/environments/nomis-combined-reporting/locals_test.tf index c2bf84761c0..5df425e5ff7 100644 --- a/terraform/environments/nomis-combined-reporting/locals_test.tf +++ b/terraform/environments/nomis-combined-reporting/locals_test.tf @@ -45,9 +45,6 @@ locals { "t1-ncr-tomcat" = local.tomcat_ssm_parameters "t1-ncr-bip" = local.bip_ssm_parameters "t1-ncr-bip-cmc" = local.bip_cmc_ssm_parameters - - "/oracle/database/T1BIPSYS" = local.database_ssm_parameters - "/oracle/database/T1BIPAUD" = local.database_ssm_parameters } baseline_secretsmanager_secrets = { diff --git a/terraform/environments/nomis/locals_database.tf b/terraform/environments/nomis/locals_database.tf index c04193e63a0..82fb842eaee 100644 --- a/terraform/environments/nomis/locals_database.tf +++ b/terraform/environments/nomis/locals_database.tf @@ -6,24 +6,6 @@ locals { - database_nomis_ssm_parameters = { - parameters = { - passwords = { description = "database passwords" } - weblogic-passwords = { description = "passwords available to weblogic servers" } - } - } - database_mis_ssm_parameters = { - parameters = { - passwords = { description = "database passwords" } - misload-config = { description = "misload username, password and hostname" } - } - } - database_ssm_parameters = { - parameters = { - passwords = { description = "database passwords" } - } - } - database_nomis_secretsmanager_secrets = { secrets = { passwords = { description = "database passwords" } diff --git a/terraform/environments/nomis/locals_development.tf b/terraform/environments/nomis/locals_development.tf index 596b73a9a6b..11404970d38 100644 --- a/terraform/environments/nomis/locals_development.tf +++ b/terraform/environments/nomis/locals_development.tf @@ -62,16 +62,7 @@ locals { } } - baseline_ssm_parameters = { - "/oracle/weblogic/qa11r" = local.weblogic_ssm_parameters - "/oracle/database/qa11r" = local.database_nomis_ssm_parameters - } baseline_secretsmanager_secrets = { - "/azure" = { - secrets = { - sas_token = {} - } - } "/oracle/weblogic/qa11r" = local.weblogic_secretsmanager_secrets "/oracle/database/qa11r" = local.database_nomis_secretsmanager_secrets } diff --git a/terraform/environments/nomis/locals_preproduction.tf b/terraform/environments/nomis/locals_preproduction.tf index 110dbc633ca..a174c3c7dbc 100644 --- a/terraform/environments/nomis/locals_preproduction.tf +++ b/terraform/environments/nomis/locals_preproduction.tf @@ -96,14 +96,6 @@ locals { } } - baseline_ssm_parameters = { - "/oracle/weblogic/preprod" = local.weblogic_ssm_parameters - "/oracle/database/PPCNOM" = local.database_nomis_ssm_parameters - "/oracle/database/PPNDH" = local.database_ssm_parameters - "/oracle/database/PPTRDAT" = local.database_ssm_parameters - "/oracle/database/PPCNMAUD" = local.database_ssm_parameters - "/oracle/database/PPMIS" = local.database_mis_ssm_parameters - } baseline_secretsmanager_secrets = { "/oracle/weblogic/preprod" = local.weblogic_secretsmanager_secrets "/oracle/database/PPCNOM" = local.database_nomis_secretsmanager_secrets diff --git a/terraform/environments/nomis/locals_production.tf b/terraform/environments/nomis/locals_production.tf index 1530f024c70..f555ce45ce2 100644 --- a/terraform/environments/nomis/locals_production.tf +++ b/terraform/environments/nomis/locals_production.tf @@ -93,19 +93,6 @@ locals { } } - baseline_ssm_parameters = { - "/oracle/weblogic/prod" = local.weblogic_ssm_parameters - "/oracle/database/PCNOM" = local.database_nomis_ssm_parameters - "/oracle/database/PNDH" = local.database_ssm_parameters - "/oracle/database/PTRDAT" = local.database_ssm_parameters - "/oracle/database/PCNMAUD" = local.database_ssm_parameters - "/oracle/database/PMIS" = local.database_mis_ssm_parameters - "/oracle/database/DRCNOM" = local.database_nomis_ssm_parameters - "/oracle/database/DRNDH" = local.database_ssm_parameters - "/oracle/database/DRTRDAT" = local.database_ssm_parameters - "/oracle/database/DRCNMAUD" = local.database_ssm_parameters - "/oracle/database/DRMIS" = local.database_mis_ssm_parameters - } baseline_secretsmanager_secrets = { "/oracle/weblogic/prod" = local.weblogic_secretsmanager_secrets "/oracle/database/PCNOM" = local.database_nomis_secretsmanager_secrets diff --git a/terraform/environments/nomis/locals_test.tf b/terraform/environments/nomis/locals_test.tf index 21d1e1fd93a..e2092f8467a 100644 --- a/terraform/environments/nomis/locals_test.tf +++ b/terraform/environments/nomis/locals_test.tf @@ -180,21 +180,6 @@ locals { } } - baseline_ssm_parameters = { - "/oracle/weblogic/t1" = local.weblogic_ssm_parameters - "/oracle/weblogic/t2" = local.weblogic_ssm_parameters - "/oracle/weblogic/t3" = local.weblogic_ssm_parameters - "/oracle/database/T1CNOM" = local.database_nomis_ssm_parameters - "/oracle/database/T1NDH" = local.database_ssm_parameters - "/oracle/database/T1TRDAT" = local.database_ssm_parameters - "/oracle/database/T1CNMAUD" = local.database_ssm_parameters - "/oracle/database/T1MIS" = local.database_mis_ssm_parameters - "/oracle/database/T1ORSYS" = local.database_ssm_parameters - "/oracle/database/T2CNOM" = local.database_nomis_ssm_parameters - "/oracle/database/T2NDH" = local.database_ssm_parameters - "/oracle/database/T2TRDAT" = local.database_ssm_parameters - "/oracle/database/T3CNOM" = local.database_nomis_ssm_parameters - } baseline_secretsmanager_secrets = { "/oracle/weblogic/t1" = local.weblogic_secretsmanager_secrets "/oracle/weblogic/t2" = local.weblogic_secretsmanager_secrets diff --git a/terraform/environments/nomis/locals_weblogic.tf b/terraform/environments/nomis/locals_weblogic.tf index abdfabb3fb0..aed412a3a7f 100644 --- a/terraform/environments/nomis/locals_weblogic.tf +++ b/terraform/environments/nomis/locals_weblogic.tf @@ -1,12 +1,5 @@ locals { - weblogic_ssm_parameters = { - parameters = { - passwords = { description = "weblogic passwords" } - rms = { description = "combined reporting secrets" } - } - } - weblogic_secretsmanager_secrets = { secrets = { passwords = { description = "weblogic passwords" } @@ -126,7 +119,6 @@ locals { config = merge(module.baseline_presets.ec2_instance.config.default, { ami_name = "nomis_rhel_6_10_weblogic_appserver_10_3_release_2023-03-15T17-18-22.178Z" availability_zone = null - ssm_parameters_prefix = "weblogic/" iam_resource_names_prefix = "ec2-weblogic" }) diff --git a/terraform/environments/nomis/locals_xtag.tf b/terraform/environments/nomis/locals_xtag.tf index 3e4de43074b..12e428e3aa6 100644 --- a/terraform/environments/nomis/locals_xtag.tf +++ b/terraform/environments/nomis/locals_xtag.tf @@ -1,15 +1,5 @@ locals { - xtag_weblogic_ssm_parameters = { - prefix = "/weblogic/" - parameters = { - admin_username = { description = "weblogic admin username" } - admin_password = { description = "weblogic admin password" } - db_username = { description = "nomis database xtag username" } - db_password = { description = "nomis database xtag password" } - } - } - # TODO - change alarm actions to dba_pagerduty once alarms proven out xtag_cloudwatch_metric_alarms = merge( module.baseline_presets.cloudwatch_metric_alarms.ec2,