Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix acceptance tests with local SSDs #198

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Fix acceptance tests with local SSDs #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aabc821
builder: fix local SSD acceptance tests
lbajolet-hashicorp Nov 10, 2023
5a32979
docs: update local extra disk docs on local SSDs
lbajolet-hashicorp Nov 10, 2023
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
4 changes: 4 additions & 0 deletions .web-docs/components/builder/googlecompute/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ builder.
Scratch (ephemeral) SSDs are always created at launch, and deleted when the
instance is torn-down.

Note: local SSDs are not supported on all machine types, refer to the
[docs](https://cloud.google.com/compute/docs/disks/local-ssd#choose_number_local_ssds)
for more information on that.

Refer to the [Extra Disk Attachments](#extra-disk-attachments) section for
more information on this configuration type.

Expand Down
4 changes: 4 additions & 0 deletions builder/googlecompute/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ type Config struct {
// Scratch (ephemeral) SSDs are always created at launch, and deleted when the
// instance is torn-down.
//
// Note: local SSDs are not supported on all machine types, refer to the
// [docs](https://cloud.google.com/compute/docs/disks/local-ssd#choose_number_local_ssds)
// for more information on that.
//
// Refer to the [Extra Disk Attachments](#extra-disk-attachments) section for
// more information on this configuration type.
ExtraBlockDevices []BlockDevice `mapstructure:"disk_attachment" required:"false"`
Expand Down
1 change: 1 addition & 0 deletions builder/googlecompute/testdata/extra_scratch_disk.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ source "googlecompute" "test" {
source_image_family = "centos-7"
ssh_username = var.ssh_username
skip_create_image = true
machine_type = "n2-standard-2"
zone = var.zone
disk_attachment {
attachment_mode = "READ_WRITE"
Expand Down
1 change: 1 addition & 0 deletions builder/googlecompute/testdata/multiple_disks.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ source "googlecompute" "test" {
source_image_family = "centos-7"
ssh_username = var.ssh_username
skip_create_image = true
machine_type = "n2-standard-2"
zone = var.zone

disk_attachment {
Expand Down
4 changes: 4 additions & 0 deletions docs-partials/builder/googlecompute/Config-not-required.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
Scratch (ephemeral) SSDs are always created at launch, and deleted when the
instance is torn-down.

Note: local SSDs are not supported on all machine types, refer to the
[docs](https://cloud.google.com/compute/docs/disks/local-ssd#choose_number_local_ssds)
for more information on that.

Refer to the [Extra Disk Attachments](#extra-disk-attachments) section for
more information on this configuration type.

Expand Down