Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add disk_type for HTCondor's EP template #2705

Merged
merged 3 commits into from
Jul 1, 2024
Merged

Add disk_type for HTCondor's EP template #2705

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2603699
Added disk_type for htcondor EP template
aneo-ssam Jun 20, 2024
c5943a4
Pre-commit and checks
aneo-ssam Jun 20, 2024
8a70b97
Set default disk type to pd-balanced
aneo-ssam Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions community/modules/compute/htcondor-execute-point/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ limitations under the License.
| <a name="input_central_manager_ips"></a> [central\_manager\_ips](#input\_central\_manager\_ips) | List of IP addresses of HTCondor Central Managers | `list(string)` | n/a | yes |
| <a name="input_deployment_name"></a> [deployment\_name](#input\_deployment\_name) | HPC Toolkit deployment name. HTCondor cloud resource names will include this value. | `string` | n/a | yes |
| <a name="input_disk_size_gb"></a> [disk\_size\_gb](#input\_disk\_size\_gb) | Boot disk size in GB | `number` | `100` | no |
| <a name="input_disk_type"></a> [disk\_type](#input\_disk\_type) | Disk type for template | `string` | `"pd-standard"` | no |
| <a name="input_distribution_policy_target_shape"></a> [distribution\_policy\_target\_shape](#input\_distribution\_policy\_target\_shape) | Target shape across zones for instance group managing execute points | `string` | `"ANY"` | no |
| <a name="input_enable_oslogin"></a> [enable\_oslogin](#input\_enable\_oslogin) | Enable or Disable OS Login with "ENABLE" or "DISABLE". Set to "INHERIT" to inherit project OS Login setting. | `string` | `"ENABLE"` | no |
| <a name="input_enable_shielded_vm"></a> [enable\_shielded\_vm](#input\_enable\_shielded\_vm) | Enable the Shielded VM configuration (var.shielded\_instance\_config). | `bool` | `false` | no |
Expand Down
1 change: 1 addition & 0 deletions community/modules/compute/htcondor-execute-point/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ module "execute_point_instance_template" {

machine_type = var.machine_type
disk_size_gb = var.disk_size_gb
disk_type = var.disk_type
gpu = one(local.guest_accelerator)
preemptible = var.spot
startup_script = local.is_windows_image ? null : module.startup_script.startup_script
Expand Down
6 changes: 6 additions & 0 deletions community/modules/compute/htcondor-execute-point/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ variable "disk_size_gb" {
default = 100
}

variable "disk_type" {
description = "Disk type for template"
type = string
default = "pd-standard"
aneo-ssam marked this conversation as resolved.
Show resolved Hide resolved
}

variable "windows_startup_ps1" {
description = "Startup script to run at boot-time for Windows-based HTCondor execute points"
type = list(string)
Expand Down