Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
shermanyin committed Feb 16, 2024
2 parents 7147a53 + fc1495d commit 7c10da7
Show file tree
Hide file tree
Showing 54 changed files with 157 additions and 154 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/awm-lb-connectors-ha-lls/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_pcoip_agent_install" {
Expand Down Expand Up @@ -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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -492,7 +492,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_std_pcoip_agent_version" {
Expand Down
4 changes: 2 additions & 2 deletions deployments/aws/awm-lb-connectors-lls/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/awm-lb-connectors-lls/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_pcoip_agent_install" {
Expand Down Expand Up @@ -430,7 +430,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -465,7 +465,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_std_pcoip_agent_version" {
Expand Down
4 changes: 2 additions & 2 deletions deployments/aws/awm-lb-connectors/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/awm-lb-connectors/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_pcoip_agent_install" {
Expand Down Expand Up @@ -378,7 +378,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -413,7 +413,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_std_pcoip_agent_version" {
Expand Down
4 changes: 2 additions & 2 deletions deployments/aws/awm-single-connector/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/awm-single-connector/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_pcoip_agent_install" {
Expand Down Expand Up @@ -358,7 +358,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -393,7 +393,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_std_pcoip_agent_version" {
Expand Down
4 changes: 2 additions & 2 deletions deployments/aws/lb-connectors-ha-lls/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/lb-connectors-ha-lls/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_pcoip_agent_install" {
Expand Down Expand Up @@ -421,7 +421,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -461,7 +461,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "centos_gfx_instance_count" {
Expand Down
4 changes: 2 additions & 2 deletions deployments/aws/lb-connectors-lls/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/lb-connectors-lls/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_pcoip_agent_install" {
Expand Down Expand Up @@ -400,7 +400,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -435,7 +435,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_std_pcoip_agent_version" {
Expand Down
4 changes: 2 additions & 2 deletions deployments/aws/lb-connectors/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/lb-connectors/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_pcoip_agent_install" {
Expand Down Expand Up @@ -348,7 +348,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -383,7 +383,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_std_pcoip_agent_version" {
Expand Down
4 changes: 2 additions & 2 deletions deployments/aws/single-connector/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ 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-2023.12.13"
# win_gfx_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

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-2023.12.13"
# win_std_ami_name = "Windows_Server-2019-English-Full-Base-2024.01.16"

centos_gfx_instance_count = 0
# centos_gfx_instance_type = "g4dn.xlarge"
Expand Down
6 changes: 3 additions & 3 deletions deployments/aws/single-connector/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "dc_admin_password" {
Expand Down Expand Up @@ -327,7 +327,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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_gfx_pcoip_agent_version" {
Expand Down Expand Up @@ -362,7 +362,7 @@ 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-2023.12.13"
default = "Windows_Server-2019-English-Full-Base-2024.01.16"
}

variable "win_std_pcoip_agent_version" {
Expand Down
8 changes: 4 additions & 4 deletions deployments/gcp/awm-multi-region/terraform.tfvars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,21 @@ centos_std_instance_count_list = []
# win_gfx_accelerator_type = "nvidia-tesla-p4-vws"
# win_gfx_accelerator_count = 1
# win_gfx_disk_size_gb = 50
# win_gfx_disk_image = "projects/windows-cloud/global/images/windows-server-2019-dc-v20231213"
# win_gfx_disk_image = "projects/windows-cloud/global/images/windows-server-2019-dc-v20240214"

# win_std_machine_type = "n1-standard-4"
# win_std_disk_size_gb = 50
# win_std_disk_image = "projects/windows-cloud/global/images/windows-server-2019-dc-v20231213"
# win_std_disk_image = "projects/windows-cloud/global/images/windows-server-2019-dc-v20240214"

# centos_gfx_machine_type = "n1-standard-2"
# centos_gfx_accelerator_type = "nvidia-tesla-p4-vws"
# centos_gfx_accelerator_count = 1
# centos_gfx_disk_size_gb = 50
# centos_gfx_disk_image = "projects/centos-cloud/global/images/centos-7-v20240110"
# centos_gfx_disk_image = "projects/centos-cloud/global/images/centos-7-v20240213"

# centos_std_machine_type = "n1-standard-2"
# centos_std_disk_size_gb = 50
# centos_std_disk_image = "projects/centos-cloud/global/images/centos-7-v20240110"
# centos_std_disk_image = "projects/centos-cloud/global/images/centos-7-v20240213"

centos_admin_ssh_pub_key_file = "~/.ssh/id_rsa.pub"

Expand Down
Loading

0 comments on commit 7c10da7

Please sign in to comment.