Skip to content

Commit

Permalink
Update naming
Browse files Browse the repository at this point in the history
  • Loading branch information
jvhoof committed Jun 17, 2024
1 parent b0ccb71 commit c68a94c
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/terraform-deploy-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: "Day 1 - Terraform"
runs-on: ubuntu-latest
env:
TF_VAR_PREFIX: "JVH-DEVOPS"
TF_VAR_PREFIX: "jvh-devops"
TF_VAR_LOCATION: "westeurope"
TF_VAR_USERNAME: "azureuser"
TF_VAR_PASSWORD: "${{ secrets.PASSWORD }}"
Expand Down
10 changes: 5 additions & 5 deletions Azure/fortigate.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
##############################################################################################################

resource "azurerm_public_ip" "fgtpip" {
name = "${var.PREFIX}-FGT-PIP"
name = "${var.PREFIX}-fgt-pip"
location = var.LOCATION
resource_group_name = azurerm_resource_group.resourcegroup.name
allocation_method = "Static"
Expand All @@ -21,7 +21,7 @@ resource "azurerm_public_ip" "fgtpip" {
}

resource "azurerm_network_interface" "fgtifcext" {
name = "${var.PREFIX}-FGT-VM-IFC-EXT"
name = "${var.PREFIX}-fgt-vm-ifc-ext"
location = azurerm_resource_group.resourcegroup.location
resource_group_name = azurerm_resource_group.resourcegroup.name
ip_forwarding_enabled = true
Expand All @@ -43,7 +43,7 @@ resource "azurerm_network_interface_security_group_association" "fgtifcmgmtnsg"


resource "azurerm_network_interface" "fgtifcint" {
name = "${var.PREFIX}-FGT-VM-IFC-INT"
name = "${var.PREFIX}-fgt-vm-ifc-int"
location = azurerm_resource_group.resourcegroup.location
resource_group_name = azurerm_resource_group.resourcegroup.name
ip_forwarding_enabled = true
Expand All @@ -63,7 +63,7 @@ resource "azurerm_network_interface_security_group_association" "fgtifcintnsg" {
}

resource "azurerm_linux_virtual_machine" "fgtvm" {
name = "${var.PREFIX}-FGT-VM"
name = "${var.PREFIX}-fgt-vm"
location = azurerm_resource_group.resourcegroup.location
resource_group_name = azurerm_resource_group.resourcegroup.name
network_interface_ids = [azurerm_network_interface.fgtifcext.id, azurerm_network_interface.fgtifcint.id]
Expand All @@ -90,7 +90,7 @@ resource "azurerm_linux_virtual_machine" "fgtvm" {
}

os_disk {
name = "${var.PREFIX}-FGT-VM-OSDISK"
name = "${var.PREFIX}-fgt-vm-osdisk"
caching = "ReadWrite"
storage_account_type = "Premium_LRS"
}
Expand Down
16 changes: 8 additions & 8 deletions Azure/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,35 @@
##############################################################################################################

resource "azurerm_virtual_network" "vnet" {
name = "${var.PREFIX}-VNET"
name = "${var.PREFIX}-vnet"
address_space = [var.vnet]
location = azurerm_resource_group.resourcegroup.location
resource_group_name = azurerm_resource_group.resourcegroup.name
}

resource "azurerm_subnet" "subnet1" {
name = "${var.PREFIX}-SUBNET-FGT-EXTERNAL"
name = "${var.PREFIX}-subnet-fgt-external"
resource_group_name = azurerm_resource_group.resourcegroup.name
virtual_network_name = azurerm_virtual_network.vnet.name
address_prefixes = [var.subnet["1"]]
}

resource "azurerm_subnet" "subnet2" {
name = "${var.PREFIX}-SUBNET-FGT-INTERNAL"
name = "${var.PREFIX}-subnet-fgt-internal"
resource_group_name = azurerm_resource_group.resourcegroup.name
virtual_network_name = azurerm_virtual_network.vnet.name
address_prefixes = [var.subnet["2"]]
}

resource "azurerm_subnet" "subnet3" {
name = "${var.PREFIX}-SUBNET-PROTECTED-A"
name = "${var.PREFIX}-subnet-protected-a"
resource_group_name = azurerm_resource_group.resourcegroup.name
virtual_network_name = azurerm_virtual_network.vnet.name
address_prefixes = [var.subnet["3"]]
}

resource "azurerm_subnet" "subnet4" {
name = "${var.PREFIX}-SUBNET-PROTECTED-B"
name = "${var.PREFIX}-subnet-protected-b"
resource_group_name = azurerm_resource_group.resourcegroup.name
virtual_network_name = azurerm_virtual_network.vnet.name
address_prefixes = [var.subnet["4"]]
Expand All @@ -52,7 +52,7 @@ resource "azurerm_subnet_route_table_association" "subnet3rt" {
}

resource "azurerm_route_table" "protectedaroute" {
name = "${var.PREFIX}-RT-PROTECTED-A"
name = "${var.PREFIX}-rt-protected-a"
location = var.LOCATION
resource_group_name = azurerm_resource_group.resourcegroup.name

Expand Down Expand Up @@ -81,7 +81,7 @@ resource "azurerm_subnet_route_table_association" "subnet4rt" {
}

resource "azurerm_route_table" "protectedbroute" {
name = "${var.PREFIX}-RT-PROTECTED-B"
name = "${var.PREFIX}-rt-protected-b"
location = var.LOCATION
resource_group_name = azurerm_resource_group.resourcegroup.name

Expand All @@ -105,7 +105,7 @@ resource "azurerm_route_table" "protectedbroute" {
}

resource "azurerm_network_security_group" "fgtnsg" {
name = "${var.PREFIX}-FGT-NSG"
name = "${var.PREFIX}-fgt-nsg"
location = var.LOCATION
resource_group_name = azurerm_resource_group.resourcegroup.name
}
Expand Down
2 changes: 1 addition & 1 deletion Azure/output.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ output "ansible_inventory" {
location = var.LOCATION,
fgt_public_ip_address = data.azurerm_public_ip.fgtpip.ip_address,
fgt_public_fqdn = data.azurerm_public_ip.fgtpip.fqdn,
fgt_hostname = "${var.PREFIX}-FGT-VM"
fgt_hostname = "${var.PREFIX}-fgt-vm"
})
}
##############################################################################################################
8 changes: 4 additions & 4 deletions Azure/server.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
##############################################################################################################

resource "azurerm_network_interface" "lnxifc" {
name = "${var.PREFIX}-LNX-VM-ifc"
name = "${var.PREFIX}-lnx-vm-ifc"
location = var.LOCATION
resource_group_name = azurerm_resource_group.resourcegroup.name
ip_forwarding_enabled = false
Expand All @@ -25,7 +25,7 @@ resource "azurerm_network_interface" "lnxifc" {
}

resource "azurerm_virtual_machine" "lnxvm" {
name = "${var.PREFIX}-LNX-VM"
name = "${var.PREFIX}-lnx-vm"
location = var.LOCATION
resource_group_name = azurerm_resource_group.resourcegroup.name
network_interface_ids = [azurerm_network_interface.lnxifc.id]
Expand All @@ -39,14 +39,14 @@ resource "azurerm_virtual_machine" "lnxvm" {
}

storage_os_disk {
name = "${var.PREFIX}-LNX-VM-OSDISK"
name = "${var.PREFIX}-lnx-vm-osdisk"
caching = "ReadWrite"
create_option = "FromImage"
managed_disk_type = "Standard_LRS"
}

os_profile {
computer_name = "${var.PREFIX}-LNX-VM"
computer_name = "${var.PREFIX}-lnx-vm"
admin_username = var.USERNAME
admin_password = var.PASSWORD
custom_data = templatefile("${path.module}/customdata-lnx.tpl", {})
Expand Down
2 changes: 1 addition & 1 deletion Azure/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ variable "backend_tags" {
##############################################################################################################

resource "azurerm_resource_group" "resourcegroup" {
name = "${var.PREFIX}-RG"
name = "${var.PREFIX}-rg"
location = var.LOCATION
tags = var.fortinet_tags
}

0 comments on commit c68a94c

Please sign in to comment.