From 277352f3abe82a53c18bfc1f906d8c0fe51fe380 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:21:42 +0200 Subject: [PATCH 01/10] Update provider.tf changed organization to rrother-project --- Azure/provider.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Azure/provider.tf b/Azure/provider.tf index d7d5ab9..9e5d799 100644 --- a/Azure/provider.tf +++ b/Azure/provider.tf @@ -25,7 +25,7 @@ terraform { } backend "remote" { - organization = "40net-cloud" + organization = "rrother-project" workspaces { name = "github-actions-infra-as-code-demo-azure" From 9325136e0b2fb16b43d29d8e9f7371b15b25c009 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:59:21 +0200 Subject: [PATCH 02/10] Update variables.tf added prefix, added fortinet_tags --- Azure/variables.tf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Azure/variables.tf b/Azure/variables.tf index 4e04abd..e3d1767 100644 --- a/Azure/variables.tf +++ b/Azure/variables.tf @@ -14,12 +14,24 @@ # Prefix for all resources created for this deployment in Microsoft Azure variable "PREFIX" { description = "Added name to each deployed resource" + default = "github-actions-demo" } variable "LOCATION" { description = "Azure region" } +variable "fortinet_tags" { + description = "tags required for Fortinet Azure environment" + default = { + Name = "Robert Rother" + Username = rrother + ExpectedUseThrough = "2024-08" + VMState = "AlwaysOn" + CostCenter = "5900" + } +} + variable "USERNAME" { } From edba328b7c52c58b69935c33ef4ea1b02de8e31d Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:04:27 +0200 Subject: [PATCH 03/10] Update variables.tf --- Azure/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Azure/variables.tf b/Azure/variables.tf index e3d1767..017e344 100644 --- a/Azure/variables.tf +++ b/Azure/variables.tf @@ -25,7 +25,7 @@ variable "fortinet_tags" { description = "tags required for Fortinet Azure environment" default = { Name = "Robert Rother" - Username = rrother + Username = "rrother" ExpectedUseThrough = "2024-08" VMState = "AlwaysOn" CostCenter = "5900" From 4d0888aa93501c1a0c690a86df2e8202426d78d1 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:09:30 +0200 Subject: [PATCH 04/10] Update terraform-deploy-azure.yml changed TF_VAR_PREFIX to "rrother-devops" --- .github/workflows/terraform-deploy-azure.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-deploy-azure.yml b/.github/workflows/terraform-deploy-azure.yml index afc8092..8bd5e7c 100644 --- a/.github/workflows/terraform-deploy-azure.yml +++ b/.github/workflows/terraform-deploy-azure.yml @@ -25,7 +25,7 @@ jobs: name: "Day 1 - Terraform" runs-on: ubuntu-latest env: - TF_VAR_PREFIX: "jvh-devops" + TF_VAR_PREFIX: "rrother-devops" TF_VAR_LOCATION: "westeurope" TF_VAR_USERNAME: "azureuser" TF_VAR_PASSWORD: "${{ secrets.PASSWORD }}" From aae7ea7c3ace07bbe9ad9eae256fbe114d210808 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:20:27 +0200 Subject: [PATCH 05/10] Update variables.tf committing changes from terraform fmt --- Azure/variables.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Azure/variables.tf b/Azure/variables.tf index 017e344..b9c525e 100644 --- a/Azure/variables.tf +++ b/Azure/variables.tf @@ -14,7 +14,7 @@ # Prefix for all resources created for this deployment in Microsoft Azure variable "PREFIX" { description = "Added name to each deployed resource" - default = "github-actions-demo" + default = "github-actions-demo" } variable "LOCATION" { @@ -24,11 +24,11 @@ variable "LOCATION" { variable "fortinet_tags" { description = "tags required for Fortinet Azure environment" default = { - Name = "Robert Rother" - Username = "rrother" + Name = "Robert Rother" + Username = "rrother" ExpectedUseThrough = "2024-08" - VMState = "AlwaysOn" - CostCenter = "5900" + VMState = "AlwaysOn" + CostCenter = "5900" } } From 3a8e64765d8fd5e8207799b44ad1b00da0727c88 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:23:12 +0200 Subject: [PATCH 06/10] Update variables.tf fixed fortinet_tags --- Azure/variables.tf | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Azure/variables.tf b/Azure/variables.tf index b9c525e..d9849d2 100644 --- a/Azure/variables.tf +++ b/Azure/variables.tf @@ -21,17 +21,6 @@ variable "LOCATION" { description = "Azure region" } -variable "fortinet_tags" { - description = "tags required for Fortinet Azure environment" - default = { - Name = "Robert Rother" - Username = "rrother" - ExpectedUseThrough = "2024-08" - VMState = "AlwaysOn" - CostCenter = "5900" - } -} - variable "USERNAME" { } @@ -168,6 +157,11 @@ variable "fortinet_tags" { publisher : "Fortinet", template : "GitHub Actions Infra As Code Demo Azure", environment : "staging" + Name : "Robert Rother" + Username : "rrother" + ExpectedUseThrough : "2024-08" + VMState : "AlwaysOn" + CostCenter : "5900" } } From def40a985c5fd626db5f74130a231f317836f585 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:33:09 +0200 Subject: [PATCH 07/10] Update provider.tf --- Azure/provider.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Azure/provider.tf b/Azure/provider.tf index 9e5d799..a541cbe 100644 --- a/Azure/provider.tf +++ b/Azure/provider.tf @@ -25,7 +25,7 @@ terraform { } backend "remote" { - organization = "rrother-project" + organization = "rrother_fortinet" workspaces { name = "github-actions-infra-as-code-demo-azure" From c2a9021318dfd03c9cef120cd4c692e882ce9418 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:51:42 +0200 Subject: [PATCH 08/10] Update variables.tf Change from Standard_F2s to Standard_F4s --- Azure/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Azure/variables.tf b/Azure/variables.tf index d9849d2..5bde2f8 100644 --- a/Azure/variables.tf +++ b/Azure/variables.tf @@ -148,7 +148,7 @@ variable "gateway_ipaddress" { } variable "fgt_vmsize" { - default = "Standard_F2s" + default = "Standard_F4s" } variable "fortinet_tags" { From ff74a8c472df7bff6dd057d38c2e31ba49e96b19 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:02:06 +0200 Subject: [PATCH 09/10] Update variables.tf changing back to Standard_F2s --- Azure/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Azure/variables.tf b/Azure/variables.tf index 5bde2f8..d9849d2 100644 --- a/Azure/variables.tf +++ b/Azure/variables.tf @@ -148,7 +148,7 @@ variable "gateway_ipaddress" { } variable "fgt_vmsize" { - default = "Standard_F4s" + default = "Standard_F2s" } variable "fortinet_tags" { From 1f1d69ce40b46c47892ebf362076a36bf2fb6280 Mon Sep 17 00:00:00 2001 From: rhr1987 <118000755+rhr1987@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:09:50 +0200 Subject: [PATCH 10/10] Update variables.tf switch to F4s --- Azure/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Azure/variables.tf b/Azure/variables.tf index d9849d2..5bde2f8 100644 --- a/Azure/variables.tf +++ b/Azure/variables.tf @@ -148,7 +148,7 @@ variable "gateway_ipaddress" { } variable "fgt_vmsize" { - default = "Standard_F2s" + default = "Standard_F4s" } variable "fortinet_tags" {