Skip to content

Commit

Permalink
Bump Azure provider version
Browse files Browse the repository at this point in the history
  • Loading branch information
adambaumeister committed Sep 23, 2020
1 parent df5d18a commit 658cbb7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ matrix:
- pip3 install -r external/requirements.txt
- pyinstaller -F external/configure_panorama.py
- cp dist/configure_panorama modules/panorama/configure_panorama.exe
- zip -ur bundle-linux.zip variables.tf README.md modules main.tf external
- zip -ur bundle-linux.zip variables.tf example.tfvars README.md modules main.tf external
python: 3.7 # this works for Linux but is ignored on macOS or Windows
dist: xenial # required for Python >= 3.7
deploy:
Expand All @@ -32,7 +32,7 @@ matrix:
- pip3 install -r external/requirements.txt
- pyinstaller -F external/configure_panorama.py
- cp dist/configure_panorama.exe modules/panorama/configure_panorama.exe
- zip -ur bundle-windows.zip variables.tf README.md modules main.tf external
- zip -ur bundle-windows.zip variables.tf example.tfvars README.md modules main.tf external
deploy:
- provider: releases
api_key: $api_token
Expand All @@ -50,7 +50,7 @@ matrix:
- pip3 install -r external/requirements.txt
- pyinstaller -F external/configure_panorama.py
- cp dist/configure_panorama modules/panorama/configure_panorama.exe
- zip -ur bundle-macOS.zip variables.tf README.md modules main.tf external
- zip -ur bundle-macOS.zip variables.tf example.tfvars README.md modules main.tf external
deploy:
- provider: releases
api_key: $api_token
Expand Down
12 changes: 5 additions & 7 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# Configure the Azure provider
terraform {
required_providers {
azure = {
source = "hashicorp/azurerm"
version = "~>1.32.0"
}
}
provider "azurerm" {
# whilst the `version` attribute is optional, we recommend pinning to a given version of the Provider
version = "=2.20.0"
features {}
}


# Setup all the networks required for the topology
module "networks" {
source = "./modules/networks"
Expand Down
5 changes: 0 additions & 5 deletions modules/networks/networks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ resource "azurerm_subnet" "subnet-panorama-mgmt" {
address_prefix = "${var.management_vnet_prefix}${var.management_subnet}"
resource_group_name = azurerm_resource_group.rg.name
virtual_network_name = azurerm_virtual_network.vnet-panorama-mgmt.name
network_security_group_id = azurerm_network_security_group.sg-panorama-mgmt.id
}

### Now build the main networks
Expand All @@ -41,7 +40,6 @@ resource "azurerm_subnet" "subnet-mgmt" {
address_prefix = "${var.firewall_vnet_prefix}${var.vm_management_subnet}"
resource_group_name = azurerm_resource_group.rg.name
virtual_network_name = azurerm_virtual_network.vnet-vmseries.name
network_security_group_id = azurerm_network_security_group.sg-mgmt.id

}
resource "azurerm_network_security_group" "sg-mgmt" {
Expand All @@ -60,8 +58,6 @@ resource "azurerm_subnet" "subnet-inside" {
address_prefix = "${var.firewall_vnet_prefix}${var.private_subnet}"
resource_group_name = azurerm_resource_group.rg.name
virtual_network_name = azurerm_virtual_network.vnet-vmseries.name
network_security_group_id = azurerm_network_security_group.sg-allowall.id
route_table_id = azurerm_route_table.udr-inside.id
}

# Public network
Expand All @@ -75,7 +71,6 @@ resource "azurerm_subnet" "subnet-outside" {
address_prefix = "${var.firewall_vnet_prefix}${var.public_subnet}"
resource_group_name = azurerm_resource_group.rg.name
virtual_network_name = azurerm_virtual_network.vnet-vmseries.name
network_security_group_id = azurerm_network_security_group.sg-allowall.id
}
resource "azurerm_subnet_network_security_group_association" "sg-outside-associate" {
network_security_group_id = azurerm_network_security_group.sg-allowall.id
Expand Down
2 changes: 0 additions & 2 deletions modules/test-vnet/testhost.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ resource "azurerm_subnet" "subnet" {
name = "${var.name_prefix}-testhost-subnet"
resource_group_name = azurerm_resource_group.rg.name
virtual_network_name = azurerm_virtual_network.vnet.name
network_security_group_id = azurerm_network_security_group.nsg.id
address_prefix = "10.100.100.0/26"
route_table_id = var.route-table-id
}

# Create Network Security Group and rule
Expand Down

0 comments on commit 658cbb7

Please sign in to comment.