From c70462df6f8b116a9ac32de27034948afdf2bedc Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 16 Sep 2021 10:10:16 +0100 Subject: [PATCH 1/3] Update README.md Provide instructions for updating AMI ID when using a different region to the default. --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 81c95ab..2d4b2fc 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,11 @@ The remote state is defined in `aws/main.tf`. Variable interpolation is not allo - `region`: The region to use. Default `us-east-1`. - `storage_bucket`: The name of the S3 bucket to store the state file in. Default `opencti-storage`. -**Important:** If you change the region in `aws/terraform.tfvars`, you will want to change the region here, too. If you want to change the S3 bucket name (defined in `aws/terraform.tfvars`), you will also want to change it here. +**Important:** + +If you change the region in `aws/terraform.tfvars`, you will want to change the region here, too. Also, when changing the region you will need to update the ami_id in main.tf to the correct ID for the Ubuntu 20.04 LTS 64-bit x86 in your chosen region. + +If you want to change the S3 bucket name (defined in `aws/terraform.tfvars`), you will also want to change it here. ### Azure First, change into the `azure/` directory: From 9fcaf3fdaf2eed4241238109befeaf8f79e64ce6 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 16 Sep 2021 10:13:35 +0100 Subject: [PATCH 2/3] Update main.tf Added comments to update ami_id when changing regions. --- aws/main.tf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/aws/main.tf b/aws/main.tf index b15c520..99ac6a4 100644 --- a/aws/main.tf +++ b/aws/main.tf @@ -11,13 +11,16 @@ terraform { bucket = "opencti-storage" key = "terraform.tfstate" # Again, no variable interpolation in this block so make sure this matches the region defined in `terraform.tfvars`. Default `us-east-1`. + # If changing the region, also update the ami_id in the locals section below. region = "us-east-1" } } -# These variables aren't meant to be changed by the end user. + locals { - ami_id = "ami-0074ee617a234808d" # Ubuntu 20.04 LTS + # If changing the region, ensure you update to the id for the ami in your selected region. + ami_id = "ami-0074ee617a234808d" # Ubuntu 20.04 LTS (64-bit x86) + # These variables aren't meant to be changed by the end user. opencti_dir = "/opt/opencti" opencti_install_script_name = "opencti-installer.sh" opencti_connectors_script_name = "opencti-connectors.sh" From 2d56cd0bb3d8968887a6817246678ee6ccdd1264 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 16 Sep 2021 10:14:48 +0100 Subject: [PATCH 3/3] Update README.md Updated styling. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d4b2fc..1f2d2a3 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ The remote state is defined in `aws/main.tf`. Variable interpolation is not allo **Important:** -If you change the region in `aws/terraform.tfvars`, you will want to change the region here, too. Also, when changing the region you will need to update the ami_id in main.tf to the correct ID for the Ubuntu 20.04 LTS 64-bit x86 in your chosen region. +If you change the region in `aws/terraform.tfvars`, you will want to change the region here(`aws/main.tf`), too. Also, when changing the region you will need to update the ami_id to the correct ID for the Ubuntu 20.04 LTS 64-bit x86 in your chosen region. If you want to change the S3 bucket name (defined in `aws/terraform.tfvars`), you will also want to change it here.