scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-05 08:10:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a few more things

Browse source
This commit is contained in:
Fletcher Haynes 2022-01-07 07:04:01 -08:00
parent d328ead713
commit 369c91daf9
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qa/tf/ci/smoketest/main.tf
View file

@ -10,12 +10,7 @@ module "ci-cluster" {
branch = var.branch
}
<<<<<<< HEAD
resource "aws_vpc_peering_connection" "gauntlet-to-vpn" {
=======
resource "aws_vpc_peering_connection" "smoketest-to-vpn" {
# peer_vpc_id = aws_vpc.bar.id
>>>>>>> 574be963ec450073b549be1c854a18d4b9632720
vpc_id = module.ci-cluster.vpc_id
peer_vpc_id = "vpc-0cb7cf76f2079aa0e"
auto_accept = true

5
qa/tf/ci/smoketest/outputs.tf
View file

@ -9,11 +9,6 @@ output "data_node_ips" {
}
output "vpc_id" {
<<<<<<< HEAD
description = "ID of the gauntlet VPC"
value = module.samsung-cluster.vpc_id
=======
description = "ID of the VPC"
value = module.ci-cluster.vpc_id
>>>>>>> 574be963ec450073b549be1c854a18d4b9632720
}

3
qa/tf/ci/smoketest/tf.auto.tfvars
View file

@ -1,2 +1,3 @@
region = "us-east-2"
profile = "service-terraform"
profile = "terraform_fbci"
branch = "cicd-smoketest"