CBPS-1162: ability to deploy GCP instances with local NVMEs

d-nagy · d-nagy · commit 41efbfd6f82b · 2023-05-18T08:14:10.000Z
Also do some tidying of terraform files Change-Id: Ic24c331da1373f4c21856a0906ed6b48e6de2108 Reviewed-on: https://review.couchbase.org/c/perfrunner/+/191119 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: vikas chaudhary <vikas.chaudhary@couchbase.com>
diff --git a/perfrunner/utils/terraform.py b/perfrunner/utils/terraform.py
@@ -4,6 +4,7 @@
 from argparse import ArgumentParser
 from collections import Counter
 from time import sleep, time
+from typing import Dict
 from uuid import uuid4
 
 import requests
@@ -49,7 +50,7 @@ def raise_for_status(resp: requests.Response):
         resp.raise_for_status()
     except HTTPError as e:
         logger.error('HTTP Error {}: response content: {}'.format(resp.status_code, resp.content))
-        raise(e)
+        raise e
 
 
 def format_datadog_link(cluster_id: str = None, dataplane_id: str = None,
@@ -151,7 +152,7 @@ def deploy(self):
     def destroy(self):
         self.terraform_destroy(self.provider)
 
-    def create_tfvar_nodes(self):
+    def create_tfvar_nodes(self) -> Dict[str, Dict]:
         tfvar_nodes = {
             'clusters': {},
             'clients': {},
@@ -189,6 +190,7 @@ def create_tfvar_nodes(self):
 
                 parameters['image'] = image
 
+                # Set disk size and type
                 parameters['volume_size'] = int(parameters.get('volume_size', 0))
 
                 storage_class = parameters.get('storage_class', parameters.get('volume_type', None))
@@ -197,14 +199,18 @@ def create_tfvar_nodes(self):
                     storage_class = node_cluster_config.get('storage_class')
                 parameters['storage_class'] = storage_class
 
-                if 'disk_tier' not in parameters and cloud_provider == 'azure':
-                    parameters['disk_tier'] = ""
-
-                if cloud_provider in ('aws', 'gcp'):
+                # Set CSP-specific options
+                if cloud_provider == 'azure':
+                    parameters['disk_tier'] = parameters.get('disk_tier', '')
+                else:
+                    # AWS and GCP
                     parameters['iops'] = int(parameters.get('iops', 0))
                     if cloud_provider == 'aws':
                         parameters['volume_throughput'] = int(parameters.get('volume_throughput',
                                                                              0))
+                    else:
+                        # GCP
+                        parameters['local_nvmes'] = int(parameters.get('local_nvmes', 0))
 
                 del parameters['instance_capacity']
 
diff --git a/terraform/aws/Terraform.tf b/terraform/aws/Terraform.tf
@@ -293,16 +293,19 @@ resource "aws_instance" "cluster_instance" {
   subnet_id         = aws_subnet.public.id
   ami               = data.aws_ami.cluster_ami[each.key].id
   instance_type     = each.value.instance_type
+
   root_block_device {
     volume_size = 32
   }
+
   ebs_block_device {
     device_name = "/dev/sdb"
     volume_size = each.value.volume_size
     volume_type = lower(each.value.storage_class)
     throughput  = each.value.volume_throughput > 0 ? each.value.volume_throughput : null
     iops        = each.value.iops > 0 ? each.value.iops : null
   }
+
   tags = {
     Name       = var.global_tag != "" ? var.global_tag : "ClusterNode${each.key}"
     role       = "cluster"
@@ -317,13 +320,15 @@ resource "aws_instance" "client_instance" {
   subnet_id         = aws_subnet.public.id
   ami               = data.aws_ami.client_ami[each.key].id
   instance_type     = each.value.instance_type
+
   ebs_block_device {
     device_name = "/dev/sdb"
     volume_size = each.value.volume_size
     volume_type = lower(each.value.storage_class)
     throughput  = each.value.volume_throughput > 0 ? each.value.volume_throughput : null
     iops        = each.value.iops > 0 ? each.value.iops : null
   }
+
   tags = {
     Name       = var.global_tag != "" ? var.global_tag : "ClientNode${each.key}"
     role       = "client"
@@ -338,13 +343,15 @@ resource "aws_instance" "utility_instance" {
   subnet_id         = aws_subnet.public.id
   ami               = data.aws_ami.utility_ami[each.key].id
   instance_type     = each.value.instance_type
+
   ebs_block_device {
     device_name = "/dev/sdb"
     volume_size = each.value.volume_size
     volume_type = lower(each.value.storage_class)
     throughput  = each.value.volume_throughput > 0 ? each.value.volume_throughput : null
     iops        = each.value.iops > 0 ? each.value.iops : null
   }
+
   tags = {
     Name       = var.global_tag != "" ? var.global_tag : "UtilityNode${each.key}"
     role       = "utility"
@@ -359,13 +366,15 @@ resource "aws_instance" "syncgateway_instance" {
   subnet_id         = aws_subnet.public.id
   ami               = data.aws_ami.syncgateway_ami[each.key].id
   instance_type     = each.value.instance_type
+
   ebs_block_device {
     device_name = "/dev/sdb"
     volume_size = each.value.volume_size
     volume_type = lower(each.value.storage_class)
     throughput  = each.value.volume_throughput > 0 ? each.value.volume_throughput : null
     iops        = each.value.iops > 0 ? each.value.iops : null
   }
+
   tags = {
     Name       = var.global_tag != "" ? var.global_tag : "SyncGatewayNode${each.key}"
     role       = "syncgateway"
diff --git a/terraform/aws/outputs.tf b/terraform/aws/outputs.tf
@@ -1,49 +1,49 @@
 output "cluster_instance_ips" {
-    value = {
-        for k, v in aws_instance.cluster_instance: k => {
-            node_group = v.tags_all["node_group"]
-            public_ip  = v.public_dns
-        }
+  value = {
+    for k, v in aws_instance.cluster_instance: k => {
+      node_group = v.tags_all["node_group"]
+      public_ip  = v.public_dns
     }
+  }
 }
 
 output "client_instance_ips" {
-    value = {
-        for k, v in aws_instance.client_instance: k => {
-            node_group = v.tags_all["node_group"]
-            public_ip  = v.public_dns
-        }
+  value = {
+    for k, v in aws_instance.client_instance: k => {
+      node_group = v.tags_all["node_group"]
+      public_ip  = v.public_dns
     }
+  }
 }
 
 output "utility_instance_ips" {
-    value = {
-        for k, v in aws_instance.utility_instance: k => {
-            node_group = v.tags_all["node_group"]
-            public_ip  = v.public_dns
-        }
+  value = {
+    for k, v in aws_instance.utility_instance: k => {
+      node_group = v.tags_all["node_group"]
+      public_ip  = v.public_dns
     }
+  }
 }
 
 output "syncgateway_instance_ips" {
-    value = {
-        for k, v in aws_instance.syncgateway_instance: k => {
-            node_group = v.tags_all["node_group"]
-            public_ip  = v.public_dns
-        }
+  value = {
+    for k, v in aws_instance.syncgateway_instance: k => {
+      node_group = v.tags_all["node_group"]
+      public_ip  = v.public_dns
     }
+  }
 }
 
 output "network" {
-    value = {
-        vpc_id         = aws_vpc.main.id
-        subnet_cidr    = aws_subnet.public.cidr_block
-        route_table_id = aws_route_table.public.id
-    }
+  value = {
+    vpc_id         = aws_vpc.main.id
+    subnet_cidr    = aws_subnet.public.cidr_block
+    route_table_id = aws_route_table.public.id
+  }
 }
 
 output "cloud_storage" {
-    value = {
-        storage_bucket = length(aws_s3_bucket.perf-storage-bucket) != 0 ? "s3://${one(aws_s3_bucket.perf-storage-bucket).id}" : null
-    }
+  value = {
+    storage_bucket = length(aws_s3_bucket.perf-storage-bucket) != 0 ? "s3://${one(aws_s3_bucket.perf-storage-bucket).id}" : null
+  }
 }
diff --git a/terraform/azure/Terraform.tf b/terraform/azure/Terraform.tf
@@ -66,7 +66,7 @@ resource "azurerm_virtual_network" "perf-vn" {
   resource_group_name = "perf-resources-eastus"
 
   tags = {
-  deployment = var.global_tag != "" ? var.global_tag : null
+    deployment = var.global_tag != "" ? var.global_tag : null
   }
 }
 
diff --git a/terraform/azure/outputs.tf b/terraform/azure/outputs.tf
@@ -1,48 +1,48 @@
 output "cluster_instance_ips" {
-    value = {
-        for k, v in azurerm_virtual_machine.perf-cluster-vm: k => {
-            node_group = v.tags["node_group"]
-            public_ip  = azurerm_public_ip.perf-public-cluster[k].ip_address
-            private_ip = azurerm_network_interface.perf-cluster-ni[k].private_ip_address
-        }
+  value = {
+    for k, v in azurerm_virtual_machine.perf-cluster-vm: k => {
+      node_group = v.tags["node_group"]
+      public_ip  = azurerm_public_ip.perf-public-cluster[k].ip_address
+      private_ip = azurerm_network_interface.perf-cluster-ni[k].private_ip_address
     }
+  }
 }
 
 output "client_instance_ips" {
-    value = {
-        for k, v in azurerm_virtual_machine.perf-client-vm: k => {
-            node_group = v.tags["node_group"]
-            public_ip  = azurerm_public_ip.perf-public-client[k].ip_address
-            private_ip = azurerm_network_interface.perf-client-ni[k].private_ip_address
-        }
+  value = {
+    for k, v in azurerm_virtual_machine.perf-client-vm: k => {
+      node_group = v.tags["node_group"]
+      public_ip  = azurerm_public_ip.perf-public-client[k].ip_address
+      private_ip = azurerm_network_interface.perf-client-ni[k].private_ip_address
     }
+  }
 }
 
 output "utility_instance_ips" {
-    value = {
-        for k, v in azurerm_virtual_machine.perf-utility-vm: k => {
-            node_group = v.tags["node_group"]
-            public_ip  = azurerm_public_ip.perf-public-utility[k].ip_address
-            private_ip = azurerm_network_interface.perf-utility-ni[k].private_ip_address
-        }
+  value = {
+    for k, v in azurerm_virtual_machine.perf-utility-vm: k => {
+      node_group = v.tags["node_group"]
+      public_ip  = azurerm_public_ip.perf-public-utility[k].ip_address
+      private_ip = azurerm_network_interface.perf-utility-ni[k].private_ip_address
     }
+  }
 }
 
 output "syncgateway_instance_ips" {
-    value = {
-        for k, v in azurerm_virtual_machine.perf-syncgateway-vm: k => {
-            node_group = v.tags["node_group"]
-            public_ip  = azurerm_public_ip.perf-public-syncgateway[k].ip_address
-            private_ip = azurerm_network_interface.perf-syncgateway-ni[k].private_ip_address
-        }
+  value = {
+    for k, v in azurerm_virtual_machine.perf-syncgateway-vm: k => {
+      node_group = v.tags["node_group"]
+      public_ip  = azurerm_public_ip.perf-public-syncgateway[k].ip_address
+      private_ip = azurerm_network_interface.perf-syncgateway-ni[k].private_ip_address
     }
+  }
 }
 
 output "network" {
-    value = {
-        vpc_id =      azurerm_virtual_network.perf-vn.id
-        subnet_cidr = one(azurerm_subnet.perf-sn.address_prefixes)
-    }
+  value = {
+    vpc_id =      azurerm_virtual_network.perf-vn.id
+    subnet_cidr = one(azurerm_subnet.perf-sn.address_prefixes)
+  }
 }
 
 output "cloud_storage" {
diff --git a/terraform/gcp/Terraform.tf b/terraform/gcp/Terraform.tf
diff --git a/terraform/gcp/outputs.tf b/terraform/gcp/outputs.tf

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ resource "azurerm_virtual_network" "perf-vn" {`
`66`	`66`	`resource_group_name = "perf-resources-eastus"`
`67`	`67`
`68`	`68`	`tags = {`
`69`		`- deployment = var.global_tag != "" ? var.global_tag : null`
	`69`	`+ deployment = var.global_tag != "" ? var.global_tag : null`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`