Skip to content

Commit 8aa1930

Browse files
authored
Merge pull request #35 from Datatamer/disk_size
DSD-2441: allow users to specify disk size
2 parents 5077b42 + 10c036a commit 8aa1930

File tree

7 files changed

+36
-5
lines changed

7 files changed

+36
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# GCP Tamr Wrapper
22

3+
## v4.2.0 - June 16th 2023
4+
* Following optional input variables now available
5+
* tamr_instance_disk_type
6+
* tamr_instance_disk_size
7+
* Allow users to supply custom disk type and size to tamr_vm module
8+
39
## v4.1.1 - May 3rd 2023
410
* Use pathed Tamr VM module
511

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ No provider.
6565
| sql\_disk\_type | The disk type to use on the cloud SQL instance. should be either PD\_SSD or PD\_STANDARD | `string` | `"PD_SSD"` | no |
6666
| sql\_tier | the machine type to use for the sql instance | `string` | `"db-custom-2-4096"` | no |
6767
| tamr\_bigtable\_min\_nodes | Min number of nodes to scale down to | `number` | `1` | no |
68+
| tamr\_instance\_disk\_size | size of the boot disk | `number` | `100` | no |
69+
| tamr\_instance\_disk\_type | boot disk type | `string` | `"pd-ssd"` | no |
6870
| tamr\_instance\_metadata | custom metadata to attach to created VM | `map(string)` | `{}` | no |
6971
| tamr\_instance\_tags | list of network tags to attach to instance | `list(string)` | `[]` | no |
7072
| tamr\_license\_key | Set a tamr license key | `string` | `""` | no |

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.1
1+
4.2.0

examples/load_balancer/versions.tf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
terraform {
22
required_version = ">= 1.0.0"
3+
required_providers {
4+
google = {
5+
version = "~> 3.29.0"
6+
}
7+
google-beta = {
8+
version = "~> 3.29.0"
9+
}
10+
}
311
}
412

513
provider "google" {
614
project = var.project-id
715
region = "us-east1"
8-
version = "~> 3.29.0"
916
}
1017

1118
provider "google-beta" {
1219
project = var.project-id
1320
region = "us-east1"
14-
version = "~> 3.29.0"
1521
}

examples/minimal/versions.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
terraform {
22
required_version = ">= 1.0.0"
3+
required_providers {
4+
google = "~> 3.29.0"
5+
google-beta = "~> 3.29.0"
6+
}
37
}
48

59
provider "google" {
610
project = var.project-id
711
region = "us-east1"
8-
version = "~> 3.29.0"
912
}
1013

1114
provider "google-beta" {
1215
project = var.project-id
1316
region = "us-east1"
14-
version = "~> 3.29.0"
1517
}

main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ module "tamr_vm" {
9595
labels = var.labels
9696
metadata = var.tamr_instance_metadata
9797
pre_install_bash = var.pre_install_bash
98+
# boot disk
99+
tamr_instance_disk_size = var.tamr_instance_disk_size
100+
tamr_instance_disk_type = var.tamr_instance_disk_type
98101
}
99102

100103
module "config" {

variables.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,16 @@ variable "tamr_license_key" {
236236
default = ""
237237
type = string
238238
description = "Set a tamr license key"
239+
}
240+
241+
variable "tamr_instance_disk_type" {
242+
default = "pd-ssd"
243+
type = string
244+
description = "boot disk type"
245+
}
246+
247+
variable "tamr_instance_disk_size" {
248+
default = 100
249+
type = number
250+
description = "size of the boot disk"
239251
}

0 commit comments

Comments
 (0)