Fix conflict issues

terraform/config/groups.json

@@ -56,13 +56,8 @@
     ],
     "users": [
       {
-<<<<<<< HEAD
         "id": "user_id_here",
         "name": "user_name"
-=======
-        "id": "USER ID 1",
-        "name": "user1"
->>>>>>> b6033c5a3fd433e442e96b204dd4bc41dc3c4573
       }
     ]
   },
@@ -123,13 +118,8 @@
     ],
     "users": [
       {
-<<<<<<< HEAD
         "id": "user_id_here",
         "name": "user_name"
-=======
-        "id": "USER ID 2",
-        "name": "user2"
->>>>>>> b6033c5a3fd433e442e96b204dd4bc41dc3c4573
       }
     ]
   },
@@ -159,13 +149,8 @@
     ],
     "users": [
       {
-<<<<<<< HEAD
         "id": "user_id_here",
         "name": "user_name"
-=======
-        "id": "USER ID 3",
-        "name": "user3"
->>>>>>> b6033c5a3fd433e442e96b204dd4bc41dc3c4573
       }
     ]
   },
@@ -244,13 +229,8 @@
     ],
     "users": [
       {
-<<<<<<< HEAD
         "id": "user_id_here",
         "name": "user_name"
-=======
-        "id": "USER ID 4",
-        "name": "user4"
->>>>>>> b6033c5a3fd433e442e96b204dd4bc41dc3c4573
       }
     ]
   }

terraform/config/projects.json

@@ -1,16 +1,7 @@
 {
-<<<<<<< HEAD
     "eu-west-0": "project_id_here",
     "eu-west-0_Shared_Services": "project_id_here",
     "eu-west-0_Dev": "project_id_here",
     "eu-west-0_PreProd": "project_id_here",
     "eu-west-0_Prod": "project_id_here"
-}
-=======
-    "eu-west-0": "NETWORK TENANT ID",
-    "eu-west-0_Shared_Services10": "SHARED SERVICES TENANT ID",
-    "eu-west-0_Dev10": "DEV TENANT ID",
-    "eu-west-0_PreProd10": "PREPROD TENANT ID",
-    "eu-west-0_Prod10": "PROD TENANT ID"
-}
->>>>>>> b6033c5a3fd433e442e96b204dd4bc41dc3c4573
+}

terraform/config/terraform.tfvars

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 domain_name = "domain_name_here"
 domain_id = "domain_id_here"
-=======
-domain_name = "DOMAINE NAME HERE"
->>>>>>> b6033c5a3fd433e442e96b204dd4bc41dc3c4573
 tenant_name = "eu-west-0"
-region      = "eu-west-0"
+region      = "eu-west-0"

terraform/scenario/bvpn-dmz-private-multicloud/terraform.tfvars

@@ -1,5 +1,5 @@
-domain_name = "XXXXXXXX"
-tenant_name = "XXXXXXXX"
+domain_name = "OCB000XXXX"
+tenant_name = "eu-west-0"
 region = "eu-west-0"
 
 tag = "bvpn-dmz-private-multicloud"

terraform/scenario/bvpn-dmz-prod-dev-multicloud/terraform.tfvars

@@ -1,5 +1,5 @@
-domain_name = "XXXXXXX"
-tenant_name = "XXXXXXX"
+domain_name = "OCB000XXXX"
+tenant_name = "eu-west-0"
 region = "eu-west-0"
 
 tag = "bvpn-dmz-prod-dev-multicloud"

terraform/scenario/north-south-filtering-multi-vpc/terraform.tfvars

@@ -1,17 +1,17 @@
 domain_name = "OCB000XXXX"
-tenant_name = "XXXXXXXXXXXXXX"
+tenant_name = "eu-west-0"
 region = "eu-west-0"
 availability_zone_names = [
   "eu-west-0a",
   "eu-west-0b",
   "eu-west-0c"
 ]
 
-cidr_vpc = "192.168.0.0/16"
-cidr_subnet_in = "192.168.1.0/24"
-cidr_subnet_out = "192.168.2.0/24"
-gateway_in = "192.168.1.1"
-gateway_out = "192.168.2.1"
+cidr_vpc = "192.170.0.0/16"
+cidr_subnet_in = "192.170.1.0/24"
+cidr_subnet_out = "192.170.2.0/24"
+gateway_in = "192.170.1.1"
+gateway_out = "192.170.2.1"
 
 cidr_private_vpc = "192.169.0.0/16"
 cidr_private_subnet = "192.169.1.0/24"

terraform/scenario/north-south-filtering-single-vpc/terraform.tfvars

@@ -1,14 +1,14 @@
 domain_name = "OCB000XXXX"
-tenant_name = "XXXXXXXXXXXXXX"
+tenant_name = "eu-west-0"
 region = "eu-west-0"
 availability_zone_names = [
   "eu-west-0a",
   "eu-west-0b",
   "eu-west-0c"
 ]
 
-cidr_vpc = "192.168.0.0/16"
-cidr_subnet_in = "192.168.1.0/24"
-cidr_subnet_out = "192.168.2.0/24"
-gateway_in = "192.168.1.1"
-gateway_out = "192.168.2.1"
+cidr_vpc = "192.170.0.0/16"
+cidr_subnet_in = "192.170.1.0/24"
+cidr_subnet_out = "192.170.2.0/24"
+gateway_in = "192.170.1.1"
+gateway_out = "192.170.2.1"