From 5427b0222de869f63f53d06f2797b889542be66b Mon Sep 17 00:00:00 2001 From: Hope Aitchison Date: Mon, 4 Mar 2024 17:16:54 +0000 Subject: [PATCH] updating tags to be more consistet in cafm --- .../planetfm/locals_preproduction.tf | 17 +++---- .../planetfm/locals_production.tf | 48 +++++++------------ 2 files changed, 27 insertions(+), 38 deletions(-) diff --git a/terraform/environments/planetfm/locals_preproduction.tf b/terraform/environments/planetfm/locals_preproduction.tf index 818ce6ef6c1..7582c3c03d8 100644 --- a/terraform/environments/planetfm/locals_preproduction.tf +++ b/terraform/environments/planetfm/locals_preproduction.tf @@ -26,7 +26,8 @@ locals { "/dev/sdg" = { type = "gp3", size = 200 } } tags = merge(local.defaults_database_ec2.tags, { - description = "copy of PPFDW0030 SQL Server" + pre-migration = "PPFDW0030" + description = "SQL Server" app-config-status = "pending" ami = "pp-cafm-db-a" }) @@ -49,9 +50,9 @@ locals { "/dev/sda1" = { type = "gp3", size = 128 } # root volume } tags = merge(local.defaults_app_ec2.tags, { - description = "Migrated server PPFAW0010 PFME Licence Server" + pre-migration = "PPFAW0010" + description = "RDS Session Host and CAFM App Server/PFME Licence Server" ami = "pp-cafm-a-10-b" - app-config-status = "pending" }) }) @@ -71,9 +72,9 @@ locals { "/dev/sda1" = { type = "gp3", size = 128 } # root volume } tags = merge(local.defaults_app_ec2.tags, { - description = "Migrated server PPFAW011 RDS session host app server" + pre-migration = "PPFAW011" + description = "RDS session host & app server" ami = "pp-cafm-a-11-a" - app-config-status = "pending" }) }) @@ -94,9 +95,9 @@ locals { "/dev/sda1" = { type = "gp3", size = 128 } # root volume } tags = merge(local.defaults_web_ec2.tags, { - description = "Migrated server PPFWW0004 Web Portal Server" + pre-migration = "PPFWW0004" + description = "Web Portal Server" ami = "pp-cafm-w-4-b" - app-config-status = "pending" }) }) @@ -116,9 +117,9 @@ locals { "/dev/sda1" = { type = "gp3", size = 128 } # root volume } tags = merge(local.defaults_web_ec2.tags, { + pre-migration = "PPFWW0005" description = "Migrated server PPFWW0005 Web Portal Server" ami = "pp-cafm-w-5-a" - app-config-status = "pending" }) }) } diff --git a/terraform/environments/planetfm/locals_production.tf b/terraform/environments/planetfm/locals_production.tf index 8a1ef1a0e0a..e3a9ba60055 100644 --- a/terraform/environments/planetfm/locals_production.tf +++ b/terraform/environments/planetfm/locals_production.tf @@ -29,7 +29,8 @@ locals { "/dev/sdi" = { type = "gp3", size = 250 } # U: drive } tags = merge(local.defaults_database_ec2.tags, { - description = "Copy of PDFDW0030 SQL Server" + pre-migration = "PDFDW0030" + description = "SQL Server" app-config-status = "pending" ami = "pd-cafm-db-a" }) @@ -58,7 +59,8 @@ locals { "/dev/sdi" = { type = "gp3", size = 250 } # U: drive } tags = merge(local.defaults_database_ec2.tags, { - description = "copy of PDFDW0031 SQL resilient Server" + pre-migration = "PDFDW0031" + description = "SQL resilient Server" app-config-status = "pending" ami = "pd-cafm-db-b" }) @@ -82,11 +84,9 @@ locals { "/dev/sdb" = { type = "gp3", size = 200 } } tags = { - description = "RDS Session Host and CAFM App Server/PFME Licence Server copy of PDFAW0010" - app-config-status = "pending" - os-type = "Windows" + pre-migration = "PDFAW0010" + description = "RDS Session Host and CAFM App Server/PFME Licence Server" ami = "pd-cafm-a-10-b" - component = "app" } route53_records = { create_internal_record = true @@ -110,11 +110,9 @@ locals { "/dev/sdb" = { type = "gp3", size = 200 } } tags = { - description = "CAFM App server copy of PDFWA0011" - app-config-status = "pending" - os-type = "Windows" + pre-migration = "PDFWA0011" + description = "RDS session host & app server" ami = "pd-cafm-a-11-a" - component = "app" } route53_records = { create_internal_record = true @@ -138,11 +136,9 @@ locals { "/dev/sdb" = { type = "gp3", size = 200 } } tags = { - description = "RDS Session Host and CAFM App Server. Copy of PDFAW0012" - app-config-status = "pending" - os-type = "Windows" + pre-migration = "PDFAW0012" + description = "RDS session host & app Server" ami = "pd-cafm-a-12-b" - component = "app" } route53_records = { create_internal_record = true @@ -166,11 +162,9 @@ locals { "/dev/sdb" = { type = "gp3", size = 28 } } tags = { - description = "RDS Session Host and CAFM App Server. Copy of PDFAW0013" - app-config-status = "pending" - os-type = "Windows" + pre-migration = "PDFAW0013" + description = "RDS session host & App Server" ami = "pd-cafm-a-13-a" - component = "app" } route53_records = { create_internal_record = true @@ -196,11 +190,9 @@ locals { "/dev/sdb" = { type = "gp3", size = 28 } } tags = { - description = "CAFM Asset Management. Copy of PDFWW00036" - app-config-status = "pending" - os-type = "Windows" + pre-migration = "PDFWW00036" + description = "CAFM Asset Management" ami = "pd-cafm-w-36-b" - component = "web" } route53_records = { create_internal_record = true @@ -224,11 +216,9 @@ locals { "/dev/sdb" = { type = "gp3", size = 28 } } tags = { - description = "CAFM Assessment Management copy of PFWW00037" - app-config-status = "pending" - os-type = "Windows" + pre-migration = "PFWW00037" + description = "CAFM Assessment Management" ami = "pd-cafm-w-37-a" - component = "web" } route53_records = { create_internal_record = true @@ -252,11 +242,9 @@ locals { "/dev/sdb" = { type = "gp3", size = 100 } } tags = { - description = "CAFM Web Training migrated server PDFWW3QCP660001" - app-config-status = "pending" - os-type = "Windows" + pre-migration = "PDFWW3QCP660001" + description = "CAFM Web Training" ami = "pd-cafm-w-38-b" - component = "web" } route53_records = { create_internal_record = true