Merge branch 'staging'

HPInc · Apr 19, 2024 · 3c0e7f9 · 3c0e7f9
2 parents 7c10da7 + 1dc2c43
commit 3c0e7f9
Show file tree

Hide file tree

Showing 125 changed files with 2,212 additions and 3,301 deletions.
diff --git a/deployments/aws/awm-lb-connectors-ha-lls/main.tf b/deployments/aws/awm-lb-connectors-ha-lls/main.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2022;  © Copyright 2022-2023 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2022;  © Copyright 2022-2024 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -291,10 +291,10 @@ module "awc" {
   cloudwatch_enable       = var.cloudwatch_enable
   cloudwatch_setup_script = local.cloudwatch_setup_rpm_script
 
-  centos_gfx_instance_count = var.centos_gfx_instance_count
-  centos_std_instance_count = var.centos_std_instance_count
-  win_gfx_instance_count    = var.win_gfx_instance_count
-  win_std_instance_count    = var.win_std_instance_count
+  rocky_gfx_instance_count = var.rocky_gfx_instance_count
+  rocky_std_instance_count = var.rocky_std_instance_count
+  win_gfx_instance_count   = var.win_gfx_instance_count
+  win_std_instance_count   = var.win_std_instance_count
 }
 
 resource "aws_lb_target_group_attachment" "awc-tg-attachment" {
@@ -397,8 +397,8 @@ module "win-std" {
   depends_on = [aws_nat_gateway.nat]
 }
 
-module "centos-gfx" {
-  source = "../../../modules/aws/centos-gfx"
+module "rocky-gfx" {
+  source = "../../../modules/aws/rocky-gfx"
 
   prefix = var.prefix
 
@@ -431,13 +431,13 @@ module "centos-gfx" {
   idle_shutdown_minutes_idle_before_shutdown = var.idle_shutdown_minutes_idle_before_shutdown
   idle_shutdown_polling_interval_minutes     = var.idle_shutdown_polling_interval_minutes
 
-  instance_count = var.centos_gfx_instance_count
-  instance_name  = var.centos_gfx_instance_name
-  instance_type  = var.centos_gfx_instance_type
-  disk_size_gb   = var.centos_gfx_disk_size_gb
+  instance_count = var.rocky_gfx_instance_count
+  instance_name  = var.rocky_gfx_instance_name
+  instance_type  = var.rocky_gfx_instance_type
+  disk_size_gb   = var.rocky_gfx_disk_size_gb
 
-  ami_owner = var.centos_gfx_ami_owner
-  ami_name  = var.centos_gfx_ami_name
+  ami_owner = var.rocky_gfx_ami_owner
+  ami_name  = var.rocky_gfx_ami_name
 
   admin_ssh_key_name = local.admin_ssh_key_name
 
@@ -449,8 +449,8 @@ module "centos-gfx" {
   depends_on = [aws_nat_gateway.nat]
 }
 
-module "centos-std" {
-  source = "../../../modules/aws/centos-std"
+module "rocky-std" {
+  source = "../../../modules/aws/rocky-std"
 
   prefix = var.prefix
 
@@ -483,13 +483,13 @@ module "centos-std" {
   idle_shutdown_minutes_idle_before_shutdown = var.idle_shutdown_minutes_idle_before_shutdown
   idle_shutdown_polling_interval_minutes     = var.idle_shutdown_polling_interval_minutes
 
-  instance_count = var.centos_std_instance_count
-  instance_name  = var.centos_std_instance_name
-  instance_type  = var.centos_std_instance_type
-  disk_size_gb   = var.centos_std_disk_size_gb
+  instance_count = var.rocky_std_instance_count
+  instance_name  = var.rocky_std_instance_name
+  instance_type  = var.rocky_std_instance_type
+  disk_size_gb   = var.rocky_std_disk_size_gb
 
-  ami_owner = var.centos_std_ami_owner
-  ami_name  = var.centos_std_ami_name
+  ami_owner = var.rocky_std_ami_owner
+  ami_name  = var.rocky_std_ami_name
 
   admin_ssh_key_name = local.admin_ssh_key_name
 

diff --git a/deployments/aws/awm-lb-connectors-ha-lls/networking.tf b/deployments/aws/awm-lb-connectors-ha-lls/networking.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2021; © Copyright 2021-2023 HP Development Company, L.P
+ * Copyright Teradici Corporation 2020-2021; © Copyright 2021-2024 HP Development Company, L.P
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -867,7 +867,7 @@ resource "aws_network_acl" "nacls-ws" {
   vpc_id     = aws_vpc.vpc.id
   subnet_ids = [aws_subnet.ws-subnet.id]
 
-  # allow-ssh for centos
+  # allow-ssh for rocky
   dynamic "ingress" {
     for_each = var.enable_ssh ? local.allowed_admin_cidrs : []
 

diff --git a/deployments/aws/awm-lb-connectors-ha-lls/output.tf b/deployments/aws/awm-lb-connectors-ha-lls/output.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2021;  © Copyright 2022-2023 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2021;  © Copyright 2022-2024 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -57,18 +57,18 @@ output "win-std-public-ip" {
   value = module.win-std.public-ip
 }
 
-output "centos-gfx-internal-ip" {
-  value = module.centos-gfx.internal-ip
+output "rocky-gfx-internal-ip" {
+  value = module.rocky-gfx.internal-ip
 }
 
-output "centos-gfx-public-ip" {
-  value = module.centos-gfx.public-ip
+output "rocky-gfx-public-ip" {
+  value = module.rocky-gfx.public-ip
 }
 
-output "centos-std-internal-ip" {
-  value = module.centos-std.internal-ip
+output "rocky-std-internal-ip" {
+  value = module.rocky-std.internal-ip
 }
 
-output "centos-std-public-ip" {
-  value = module.centos-std.public-ip
+output "rocky-std-public-ip" {
+  value = module.rocky-std.public-ip
 }
diff --git a/deployments/aws/awm-lb-connectors-ha-lls/terraform.tfvars.sample b/deployments/aws/awm-lb-connectors-ha-lls/terraform.tfvars.sample
@@ -84,25 +84,25 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2024.01.16"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2024.04.10"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2024.01.16"
-
-centos_gfx_instance_count = 0
-# centos_gfx_instance_type = "g4dn.xlarge"
-# centos_gfx_disk_size_gb  = 50
-# centos_gfx_ami_owner     = "125523088429"
-# centos_gfx_ami_name      = "CentOS Linux 7 x86_64 - 2211"
-
-centos_std_instance_count = 0
-# centos_std_instance_type = "t3.xlarge"
-# centos_std_disk_size_gb  = 50
-# centos_std_ami_owner     = "125523088429"
-# centos_std_ami_name      = "CentOS Linux 7 x86_64 - 2211"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2024.04.10"
+
+rocky_gfx_instance_count = 0
+# rocky_gfx_instance_type = "g4dn.xlarge"
+# rocky_gfx_disk_size_gb  = 50
+# rocky_gfx_ami_owner     = "792107900819"
+# rocky_gfx_ami_name      = "Rocky-8-EC2-Base-8.8-20230518.0.x86_64" 
+
+rocky_std_instance_count = 0
+# rocky_std_instance_type = "t3.xlarge"
+# rocky_std_disk_size_gb  = 50
+# rocky_std_ami_owner     = "792107900819"
+# rocky_std_ami_name      = "Rocky-8-EC2-Base-8.8-20230518.0.x86_64" 
 
 # Note Windows passwords must be at least 7 characters long and meet complexity
 # requirements:

diff --git a/deployments/aws/awm-lb-connectors-ha-lls/vars.tf b/deployments/aws/awm-lb-connectors-ha-lls/vars.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2021;  © Copyright 2022-2023 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2021;  © Copyright 2022-2024 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -46,7 +46,7 @@ variable "az_id_exclude_list" {
 }
 
 # NetBIOS name is limited to 15 characters. 10 characters are reserved for workstation type
-# and number of instance. e.g. -scent-999. So the max length for prefix is 5 characters. 
+# and number of instance. e.g. -srock-999. So the max length for prefix is 5 characters. 
 variable "prefix" {
   description = "Prefix to add to name of new resources. Must be <= 5 characters."
   default     = ""
@@ -125,7 +125,7 @@ variable "dc_ami_owner" {
 
 variable "dc_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2024.01.16"
+  default     = "Windows_Server-2019-English-Full-Base-2024.04.10"
 }
 
 variable "dc_pcoip_agent_install" {
@@ -457,7 +457,7 @@ variable "win_gfx_ami_owner" {
 
 variable "win_gfx_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2024.01.16"
+  default     = "Windows_Server-2019-English-Full-Base-2024.04.10"
 }
 
 variable "win_gfx_pcoip_agent_version" {
@@ -492,74 +492,74 @@ variable "win_std_ami_owner" {
 
 variable "win_std_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2024.01.16"
+  default     = "Windows_Server-2019-English-Full-Base-2024.04.10"
 }
 
 variable "win_std_pcoip_agent_version" {
   description = "Version of PCoIP Agent to install for Windows Standard Workstations"
   default     = "latest"
 }
 
-variable "centos_gfx_instance_count" {
-  description = "Number of CentOS Graphics Workstations"
+variable "rocky_gfx_instance_count" {
+  description = "Number of Rocky Linux 8 Graphics Workstations"
   default     = 0
 }
 
-variable "centos_gfx_instance_name" {
-  description = "Name for CentOS Graphics Workstations"
-  default     = "gcent"
+variable "rocky_gfx_instance_name" {
+  description = "Name for Rocky Linux 8 Graphics Workstations"
+  default     = "grock"
 }
 
 # G4s are Tesla T4s
 # G3s are M60
-variable "centos_gfx_instance_type" {
-  description = "Instance type for the CentOS Graphics Workstations"
+variable "rocky_gfx_instance_type" {
+  description = "Instance type for the Rocky Linux 8 Graphics Workstations"
   default     = "g4dn.xlarge"
 }
 
-variable "centos_gfx_disk_size_gb" {
-  description = "Disk size (GB) of the CentOS Graphics Workstations"
+variable "rocky_gfx_disk_size_gb" {
+  description = "Disk size (GB) of the Rocky Linux 8 Graphics Workstations"
   default     = "50"
 }
 
-variable "centos_gfx_ami_owner" {
-  description = "Owner of AMI for the CentOS Graphics Workstations"
-  default     = "125523088429"
+variable "rocky_gfx_ami_owner" {
+  description = "Owner of AMI for the Rocky Linux 8 Graphics Workstations"
+  default     = "792107900819"
 }
 
-variable "centos_gfx_ami_name" {
-  description = "Name of the CentOS AMI to create workstation from"
-  default     = "CentOS Linux 7 x86_64 - 2211"
+variable "rocky_gfx_ami_name" {
+  description = "Name of the Rocky Linux 8 AMI to create workstation from"
+  default     = "Rocky-8-EC2-Base-8.8-20230518.0.x86_64"
 }
 
-variable "centos_std_instance_count" {
-  description = "Number of CentOS Standard Workstations"
+variable "rocky_std_instance_count" {
+  description = "Number of Rocky Linux 8 Standard Workstations"
   default     = 0
 }
 
-variable "centos_std_instance_name" {
-  description = "Name for CentOS Standard Workstations"
-  default     = "scent"
+variable "rocky_std_instance_name" {
+  description = "Name for Rocky Linux 8 Standard Workstations"
+  default     = "srock"
 }
 
-variable "centos_std_instance_type" {
-  description = "Instance type for the CentOS Standard Workstations"
+variable "rocky_std_instance_type" {
+  description = "Instance type for the Rocky Linux 8 Standard Workstations"
   default     = "t3.xlarge"
 }
 
-variable "centos_std_disk_size_gb" {
-  description = "Disk size (GB) of the CentOS Standard Workstations"
+variable "rocky_std_disk_size_gb" {
+  description = "Disk size (GB) of the Rocky Linux 8 Standard Workstations"
   default     = "50"
 }
 
-variable "centos_std_ami_owner" {
-  description = "Owner of AMI for the CentOS Standard Workstations"
-  default     = "125523088429"
+variable "rocky_std_ami_owner" {
+  description = "Owner of AMI for the Rocky Linux 8 Standard Workstations"
+  default     = "792107900819"
 }
 
-variable "centos_std_ami_name" {
-  description = "Name of the CentOS AMI to create workstation from"
-  default     = "CentOS Linux 7 x86_64 - 2211"
+variable "rocky_std_ami_name" {
+  description = "Name of the Rocky Linux 8 AMI to create workstation from"
+  default     = "Rocky-8-EC2-Base-8.8-20230518.0.x86_64"
 }
 
 variable "auto_logoff_enable" {

diff --git a/deployments/aws/awm-lb-connectors-lls/main.tf b/deployments/aws/awm-lb-connectors-lls/main.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2022;  © Copyright 2022-2023 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2022;  © Copyright 2022-2024 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -286,10 +286,10 @@ module "awc" {
   cloudwatch_enable       = var.cloudwatch_enable
   cloudwatch_setup_script = local.cloudwatch_setup_rpm_script
 
-  centos_gfx_instance_count = var.centos_gfx_instance_count
-  centos_std_instance_count = var.centos_std_instance_count
-  win_gfx_instance_count    = var.win_gfx_instance_count
-  win_std_instance_count    = var.win_std_instance_count
+  rocky_gfx_instance_count = var.rocky_gfx_instance_count
+  rocky_std_instance_count = var.rocky_std_instance_count
+  win_gfx_instance_count   = var.win_gfx_instance_count
+  win_std_instance_count   = var.win_std_instance_count
 }
 
 resource "aws_lb_target_group_attachment" "awc-tg-attachment" {
@@ -392,8 +392,8 @@ module "win-std" {
   depends_on = [aws_nat_gateway.nat]
 }
 
-module "centos-gfx" {
-  source = "../../../modules/aws/centos-gfx"
+module "rocky-gfx" {
+  source = "../../../modules/aws/rocky-gfx"
 
   prefix = var.prefix
 
@@ -426,13 +426,13 @@ module "centos-gfx" {
   idle_shutdown_minutes_idle_before_shutdown = var.idle_shutdown_minutes_idle_before_shutdown
   idle_shutdown_polling_interval_minutes     = var.idle_shutdown_polling_interval_minutes
 
-  instance_count = var.centos_gfx_instance_count
-  instance_name  = var.centos_gfx_instance_name
-  instance_type  = var.centos_gfx_instance_type
-  disk_size_gb   = var.centos_gfx_disk_size_gb
+  instance_count = var.rocky_gfx_instance_count
+  instance_name  = var.rocky_gfx_instance_name
+  instance_type  = var.rocky_gfx_instance_type
+  disk_size_gb   = var.rocky_gfx_disk_size_gb
 
-  ami_owner = var.centos_gfx_ami_owner
-  ami_name  = var.centos_gfx_ami_name
+  ami_owner = var.rocky_gfx_ami_owner
+  ami_name  = var.rocky_gfx_ami_name
 
   admin_ssh_key_name = local.admin_ssh_key_name
 
@@ -444,8 +444,8 @@ module "centos-gfx" {
   depends_on = [aws_nat_gateway.nat]
 }
 
-module "centos-std" {
-  source = "../../../modules/aws/centos-std"
+module "rocky-std" {
+  source = "../../../modules/aws/rocky-std"
 
   prefix = var.prefix
 
@@ -478,13 +478,13 @@ module "centos-std" {
   idle_shutdown_minutes_idle_before_shutdown = var.idle_shutdown_minutes_idle_before_shutdown
   idle_shutdown_polling_interval_minutes     = var.idle_shutdown_polling_interval_minutes
 
-  instance_count = var.centos_std_instance_count
-  instance_name  = var.centos_std_instance_name
-  instance_type  = var.centos_std_instance_type
-  disk_size_gb   = var.centos_std_disk_size_gb
+  instance_count = var.rocky_std_instance_count
+  instance_name  = var.rocky_std_instance_name
+  instance_type  = var.rocky_std_instance_type
+  disk_size_gb   = var.rocky_std_disk_size_gb
 
-  ami_owner = var.centos_std_ami_owner
-  ami_name  = var.centos_std_ami_name
+  ami_owner = var.rocky_std_ami_owner
+  ami_name  = var.rocky_std_ami_name
 
   admin_ssh_key_name = local.admin_ssh_key_name