From 369c91daf980922c19b7102a52d70fec44b120e3 Mon Sep 17 00:00:00 2001
From: Fletcher Haynes <fletcher.haynes@molecula.com>
Date: Fri, 7 Jan 2022 07:04:01 -0800
Subject: [PATCH] Fixed a few more things

---
 qa/tf/ci/smoketest/main.tf        | 5 -----
 qa/tf/ci/smoketest/outputs.tf     | 5 -----
 qa/tf/ci/smoketest/tf.auto.tfvars | 3 ++-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/qa/tf/ci/smoketest/main.tf b/qa/tf/ci/smoketest/main.tf
index 15076a4c0..88f6f4565 100644
--- a/qa/tf/ci/smoketest/main.tf
+++ b/qa/tf/ci/smoketest/main.tf
@@ -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
diff --git a/qa/tf/ci/smoketest/outputs.tf b/qa/tf/ci/smoketest/outputs.tf
index 74085b7c4..529c64914 100644
--- a/qa/tf/ci/smoketest/outputs.tf
+++ b/qa/tf/ci/smoketest/outputs.tf
@@ -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
 }
\ No newline at end of file
diff --git a/qa/tf/ci/smoketest/tf.auto.tfvars b/qa/tf/ci/smoketest/tf.auto.tfvars
index ac6de62a6..6c88b644d 100644
--- a/qa/tf/ci/smoketest/tf.auto.tfvars
+++ b/qa/tf/ci/smoketest/tf.auto.tfvars
@@ -1,2 +1,3 @@
 region  = "us-east-2"
-profile = "service-terraform"
\ No newline at end of file
+profile = "terraform_fbci"
+branch = "cicd-smoketest"
\ No newline at end of file