From 19c59020d5f930026a8b3d221bf005c30acc2a10 Mon Sep 17 00:00:00 2001 From: "c.klewar" Date: Fri, 24 May 2024 15:14:55 +0200 Subject: [PATCH] fix #2 --- .../terraform.tfvars | 2 +- .../main.tf | 4 ++-- .../provider.tf | 1 - .../terraform.tfvars | 4 +--- .../variables.tf | 10 ---------- modules | 2 +- 6 files changed, 5 insertions(+), 18 deletions(-) diff --git a/examples/single_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars b/examples/single_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars index c890db9..c5fdf54 100644 --- a/examples/single_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars +++ b/examples/single_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars @@ -4,7 +4,7 @@ project_suffix = "26" ssh_public_key_file = "path to ssh public key file" gcp_zone = "b" gcp_region = "us-east1" -gcp_instance_image = "rhel9-20240216075746-multi-voltmesh-us" +gcp_instance_image = "rhel9-20240216075746-single-voltmesh-us" gcp_existing_network_slo = "existing gcp network name for slo interface" gcp_existing_subnet_network_slo = "existing gcp subnetwork name for slo interface" f5xc_tenant = "full f5 xc tenant name e.g. playground-abcdefg" diff --git a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/main.tf b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/main.tf index dfce312..56e1405 100644 --- a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/main.tf +++ b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/main.tf @@ -19,9 +19,7 @@ module "f5xc_gcp_cloud_ce_three_node_single_nic_existing_vpc_and_subnet_3rd_part gcp_instance_image = var.gcp_instance_image gcp_instance_disk_size = var.gcp_instance_disk_size gcp_existing_network_slo = var.gcp_existing_network_slo - gcp_existing_network_sli = var.gcp_existing_network_sli gcp_existing_subnet_network_slo = var.gcp_existing_subnet_network_slo - gcp_existing_subnet_network_sli = var.gcp_existing_subnet_network_sli f5xc_tenant = var.f5xc_tenant f5xc_api_url = var.f5xc_api_url f5xc_namespace = var.f5xc_namespace @@ -30,6 +28,8 @@ module "f5xc_gcp_cloud_ce_three_node_single_nic_existing_vpc_and_subnet_3rd_part f5xc_cluster_name = format("%s-%s-%s", var.project_prefix, var.f5xc_cluster_name, var.project_suffix) f5xc_api_p12_file = var.f5xc_api_p12_file f5xc_ce_gateway_type = var.f5xc_ce_gateway_type + f5xc_cluster_latitude = var.f5xc_cluster_latitude + f5xc_cluster_longitude = var.f5xc_cluster_longitude f5xc_api_p12_cert_password = var.f5xc_api_p12_cert_password f5xc_ce_nodes = { node0 = { diff --git a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/provider.tf b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/provider.tf index 72c130c..f3a2375 100644 --- a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/provider.tf +++ b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/provider.tf @@ -8,6 +8,5 @@ provider "google" { credentials = var.gcp_application_credentials != "" ? file(var.gcp_application_credentials) : null project = var.gcp_project_id region = var.gcp_region - zone = format("%s-%s", var.gcp_region, var.gcp_zone) alias = "default" } \ No newline at end of file diff --git a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars index 06e903e..c91d2f0 100644 --- a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars +++ b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/terraform.tfvars @@ -6,11 +6,9 @@ gcp_region = "us-east1" gcp_zone_node0 = "b" gcp_zone_node1 = "c" gcp_zone_node2 = "d" -gcp_instance_image = "rhel9-20240216075746-multi-voltmesh-us" +gcp_instance_image = "rhel9-20240216075746-single-voltmesh-us" gcp_existing_network_slo = "existing gcp network name for slo interface" -gcp_existing_network_sli = "existing gcp network name for sli interface" gcp_existing_subnet_network_slo = "existing gcp subnetwork name for slo interface" -gcp_existing_subnet_network_sli = "existing gcp subnetwork name for sli interface" f5xc_tenant = "full f5 xc tenant name e.g. playground-abcdefg" f5xc_api_url = "f5 xc api url e.g. https://playground.console.ves.volterra.io/api" f5xc_cluster_name = "gcp-ce-test" diff --git a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/variables.tf b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/variables.tf index 1a73de9..fdcc40d 100644 --- a/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/variables.tf +++ b/examples/three_node_single_nic_existing_vpc_and_subnet_3rd_party_nat_gw/variables.tf @@ -119,17 +119,7 @@ variable "gcp_existing_network_slo" { type = string } -variable "gcp_existing_network_sli" { - description = "existing gcp network name sli" - type = string -} - variable "gcp_existing_subnet_network_slo" { description = "existing gcp subnetwork name slo" type = string -} - -variable "gcp_existing_subnet_network_sli" { - description = "existing gcp subnetwork name sli" - type = string } \ No newline at end of file diff --git a/modules b/modules index 7c0a251..60acce0 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 7c0a2513bd733f8854ca8652e888d938000fb9d4 +Subproject commit 60acce05e7afc1d724d725ff063584e8622ac470