add some consistent 'server-tag' attributes to help with mangement

ministryofjustice · Sep 9, 2024 · 18de4ee · 18de4ee
1 parent 5afc862
commit 18de4ee
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/terraform/environments/nomis-combined-reporting/locals_preproduction.tf b/terraform/environments/nomis-combined-reporting/locals_preproduction.tf
@@ -46,6 +46,7 @@ locals {
           nomis-combined-reporting-environment = "lsast"
           oracle-sids                          = "LSBIPSYS LSBIPAUD"
           instance-scheduling                  = "skip-scheduling"
+          server-type                          = "database"
         })
       })
 
@@ -66,7 +67,7 @@ locals {
           instance-scheduling                  = "skip-scheduling"
           node                                 = "1"
           nomis-combined-reporting-environment = "pp"
-          type                                 = "management"
+          server-type                          = "management"
         })
       })
 
@@ -87,7 +88,7 @@ locals {
           instance-scheduling                  = "skip-scheduling"
           node                                 = "2"
           nomis-combined-reporting-environment = "pp"
-          type                                 = "management"
+          server-type                          = "management"
         })
       })
 
@@ -108,6 +109,7 @@ locals {
           nomis-combined-reporting-environment = "pp"
           oracle-sids                          = "PPBIPSYS PPBIPAUD"
           instance-scheduling                  = "skip-scheduling"
+          server-type                          = "database"
         })
       })
 
@@ -127,6 +129,7 @@ locals {
           description                          = "PreProd Jumpserver and Client Tools"
           instance-scheduling                  = "skip-scheduling"
           nomis-combined-reporting-environment = "pp"
+          server-type                          = "client"
         })
       })
 
@@ -146,6 +149,7 @@ locals {
           description                          = "PreProd SAP BI Platform ETL installation and configurations"
           instance-scheduling                  = "skip-scheduling"
           nomis-combined-reporting-environment = "pp"
+          server-type                          = "etl"
         })
       })
 
@@ -186,6 +190,7 @@ locals {
           description                          = "PreProd SAP BI Platform web-tier installation and configurations"
           instance-scheduling                  = "skip-scheduling"
           nomis-combined-reporting-environment = "pp"
+          server-type                          = "web"
         })
       })
 
@@ -205,6 +210,7 @@ locals {
           description                          = "PreProd SAP BI Platform web-tier installation and configurations"
           instance-scheduling                  = "skip-scheduling"
           nomis-combined-reporting-environment = "pp"
+          server-type                          = "web"
         })
       })
 
@@ -224,6 +230,7 @@ locals {
           description                          = "PreProd SAP BI Platform web-tier admin installation and configurations"
           instance-scheduling                  = "skip-scheduling"
           nomis-combined-reporting-environment = "pp"
+          server-type                          = "web"
         })
       })
     }

diff --git a/terraform/environments/nomis-combined-reporting/locals_production.tf b/terraform/environments/nomis-combined-reporting/locals_production.tf
@@ -46,7 +46,7 @@ locals {
           description                          = "Prod SAP BI Platform CMS installation and configurations"
           node                                 = "1"
           nomis-combined-reporting-environment = "pd"
-          type                                 = "management"
+          server-type                          = "management"
           application-software-state           = "installed"
         })
       })
@@ -68,7 +68,8 @@ locals {
           description                          = "Prod SAP BI Platform CMS installation and configurations"
           node                                 = "2"
           nomis-combined-reporting-environment = "pd"
-          type                                 = "management"
+          server-type                          = "management"
+          shutdown-order                       = "1"
           application-software-state           = "installed"
         })
       })
@@ -89,6 +90,7 @@ locals {
           description                          = "PROD NCR DATABASE"
           nomis-combined-reporting-environment = "pd"
           oracle-sids                          = "PDBIPSYS PDBIPAUD"
+          server-type                          = "database"
         })
       })
 
@@ -107,6 +109,7 @@ locals {
           description                          = "PROD NCR DATABASE"
           nomis-combined-reporting-environment = "pd"
           oracle-sids                          = "DRBIPSYS DRBIPAUD"
+          server-type                          = "database"
         })
       })
 
@@ -126,6 +129,7 @@ locals {
         tags = merge(local.ec2_autoscaling_groups.jumpserver.tags, {
           description                          = "Prod Jumpserver and Client Tools"
           nomis-combined-reporting-environment = "pd"
+          server-type                          = "client"
         })
       })
 
@@ -145,6 +149,7 @@ locals {
         tags = merge(local.ec2_instances.bods.tags, {
           description                          = "Prod SAP BI Platform ETL installation and configurations"
           nomis-combined-reporting-environment = "pd"
+          server-type                          = "processing"
         })
       })
 
@@ -184,7 +189,7 @@ locals {
           description                          = "Prod SAP BI Platform installation and configurations"
           node                                 = "3"
           nomis-combined-reporting-environment = "pd"
-          type                                 = "processing"
+          server-type                          = "processing"
           application-software-state           = "installed"
         })
       })
@@ -206,7 +211,7 @@ locals {
           description                          = "Prod SAP BI Platform installation and configurations"
           node                                 = "4"
           nomis-combined-reporting-environment = "pd"
-          type                                 = "processing"
+          server-type                          = "processing"
           application-software-state           = "installed"
         })
       })
@@ -228,7 +233,7 @@ locals {
           description                          = "Prod SAP BI Platform installation and configurations"
           node                                 = "5"
           nomis-combined-reporting-environment = "pd"
-          type                                 = "processing"
+          server-type                          = "processing"
           application-software-state           = "installed"
         })
       })
@@ -250,7 +255,7 @@ locals {
           description                          = "Prod SAP BI Platform installation and configurations"
           node                                 = "6"
           nomis-combined-reporting-environment = "pd"
-          type                                 = "processing"
+          server-type                          = "processing"
           application-software-state           = "installed"
         })
       })
@@ -272,6 +277,7 @@ locals {
           description                          = "Prod SAP BI Platform web-tier installation and configurations"
           nomis-combined-reporting-environment = "pd"
           application-software-state           = "installed"
+          server-type                          = "web"
         })
       })
 
@@ -292,6 +298,7 @@ locals {
           description                          = "Prod SAP BI Platform web-tier installation and configurations"
           nomis-combined-reporting-environment = "pd"
           application-software-state           = "installed"
+          server-type                          = "web"
         })
       })
 
@@ -312,6 +319,7 @@ locals {
           description                          = "Prod SAP BI Platform web-tier installation and configurations"
           nomis-combined-reporting-environment = "pd"
           application-software-state           = "installed"
+          server-type                          = "web"
         })
       })
 
@@ -332,6 +340,7 @@ locals {
           description                          = "Prod SAP BI Platform web-tier installation and configurations"
           nomis-combined-reporting-environment = "pd"
           application-software-state           = "installed"
+          server-type                          = "web"
         })
       })
 
@@ -352,6 +361,7 @@ locals {
           description                          = "Prod SAP BI Platform web-tier admin installation and configurations"
           nomis-combined-reporting-environment = "pd"
           application-software-state           = "installed"
+          server-type                          = "web"
         })
       })
     }

diff --git a/terraform/environments/nomis-combined-reporting/locals_test.tf b/terraform/environments/nomis-combined-reporting/locals_test.tf
@@ -43,6 +43,7 @@ locals {
           nomis-combined-reporting-environment = "t1"
           oracle-sids                          = "T1BIPSYS T1BIPAUD"
           instance-scheduling                  = "skip-scheduling"
+          server-type                          = "database"
         })
       })