From 8d72792e34d3ad2fb763a2707c91873f252bb3b8 Mon Sep 17 00:00:00 2001 From: Md Kaif Khan Date: Sun, 27 Mar 2022 19:56:40 -0700 Subject: [PATCH] terraform: restrict azurerm provider's version to < 3.0 - latest azurerm provider (3.0 release) has some changes which are not working with our modules and examples. - this fix will restrict that provider's version to < 3.0, so that our autotests pass. - The ultimate fix will be to go through 3.0 release guidelines and figure out how it is affecting us and make change according to that. Change-Id: Icece1a0ba092f04874c9311b6c94b3e7b9994522 Signed-off-by: kaif --- .../examples/azure_oneregion_multipleleaf/edge/versions.tf | 3 ++- .../examples/azure_oneregion_multipleleaf/leaf/versions.tf | 3 ++- .../azure_oneregion_multipleleaf_v2/edge/versions.tf | 3 ++- .../azure_oneregion_multipleleaf_v2/leaf/versions.tf | 3 ++- .../examples/multicloud_tworegion_cloudha/edge/versions.tf | 7 +++++-- .../examples/multicloud_tworegion_cloudha/leaf/versions.tf | 7 +++++-- .../multicloud_tworegion_cloudha/topology/versions.tf | 5 ++++- .../multicloud_tworegion_provisionmode/edge/versions.tf | 1 + .../topology/versions.tf | 5 ++++- terraform/module/cloudeos/azure/rg-static/versions.tf | 1 + terraform/module/cloudeos/azure/rg/versions.tf | 1 + terraform/module/cloudeos/azure/router/versions.tf | 1 + terraform/module/cloudeos/azure/subnet-static/versions.tf | 1 + terraform/module/cloudeos/azure/subnet/versions.tf | 1 + 14 files changed, 32 insertions(+), 10 deletions(-) diff --git a/terraform/examples/azure_oneregion_multipleleaf/edge/versions.tf b/terraform/examples/azure_oneregion_multipleleaf/edge/versions.tf index ad3230f..f9760fb 100644 --- a/terraform/examples/azure_oneregion_multipleleaf/edge/versions.tf +++ b/terraform/examples/azure_oneregion_multipleleaf/edge/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { @@ -11,4 +12,4 @@ terraform { source = "hashicorp/template" } } -} \ No newline at end of file +} diff --git a/terraform/examples/azure_oneregion_multipleleaf/leaf/versions.tf b/terraform/examples/azure_oneregion_multipleleaf/leaf/versions.tf index ad3230f..f9760fb 100644 --- a/terraform/examples/azure_oneregion_multipleleaf/leaf/versions.tf +++ b/terraform/examples/azure_oneregion_multipleleaf/leaf/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { @@ -11,4 +12,4 @@ terraform { source = "hashicorp/template" } } -} \ No newline at end of file +} diff --git a/terraform/examples/azure_oneregion_multipleleaf_v2/edge/versions.tf b/terraform/examples/azure_oneregion_multipleleaf_v2/edge/versions.tf index ad3230f..f9760fb 100644 --- a/terraform/examples/azure_oneregion_multipleleaf_v2/edge/versions.tf +++ b/terraform/examples/azure_oneregion_multipleleaf_v2/edge/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { @@ -11,4 +12,4 @@ terraform { source = "hashicorp/template" } } -} \ No newline at end of file +} diff --git a/terraform/examples/azure_oneregion_multipleleaf_v2/leaf/versions.tf b/terraform/examples/azure_oneregion_multipleleaf_v2/leaf/versions.tf index ad3230f..e654de5 100644 --- a/terraform/examples/azure_oneregion_multipleleaf_v2/leaf/versions.tf +++ b/terraform/examples/azure_oneregion_multipleleaf_v2/leaf/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { @@ -11,4 +12,4 @@ terraform { source = "hashicorp/template" } } -} \ No newline at end of file +} diff --git a/terraform/examples/multicloud_tworegion_cloudha/edge/versions.tf b/terraform/examples/multicloud_tworegion_cloudha/edge/versions.tf index 7073d8c..3f73818 100644 --- a/terraform/examples/multicloud_tworegion_cloudha/edge/versions.tf +++ b/terraform/examples/multicloud_tworegion_cloudha/edge/versions.tf @@ -3,7 +3,10 @@ terraform { aws = { source = "hashicorp/aws" } - + azurerm = { + source = "hashicorp/azurerm" + version = "~> 2.0" + } cloudeos = { source = "aristanetworks/cloudeos" } @@ -11,4 +14,4 @@ terraform { source = "hashicorp/template" } } -} \ No newline at end of file +} diff --git a/terraform/examples/multicloud_tworegion_cloudha/leaf/versions.tf b/terraform/examples/multicloud_tworegion_cloudha/leaf/versions.tf index 7073d8c..3f73818 100644 --- a/terraform/examples/multicloud_tworegion_cloudha/leaf/versions.tf +++ b/terraform/examples/multicloud_tworegion_cloudha/leaf/versions.tf @@ -3,7 +3,10 @@ terraform { aws = { source = "hashicorp/aws" } - + azurerm = { + source = "hashicorp/azurerm" + version = "~> 2.0" + } cloudeos = { source = "aristanetworks/cloudeos" } @@ -11,4 +14,4 @@ terraform { source = "hashicorp/template" } } -} \ No newline at end of file +} diff --git a/terraform/examples/multicloud_tworegion_cloudha/topology/versions.tf b/terraform/examples/multicloud_tworegion_cloudha/topology/versions.tf index 0b8b93d..3f73818 100644 --- a/terraform/examples/multicloud_tworegion_cloudha/topology/versions.tf +++ b/terraform/examples/multicloud_tworegion_cloudha/topology/versions.tf @@ -3,7 +3,10 @@ terraform { aws = { source = "hashicorp/aws" } - + azurerm = { + source = "hashicorp/azurerm" + version = "~> 2.0" + } cloudeos = { source = "aristanetworks/cloudeos" } diff --git a/terraform/examples/multicloud_tworegion_provisionmode/edge/versions.tf b/terraform/examples/multicloud_tworegion_provisionmode/edge/versions.tf index b873e3f..0c63c70 100644 --- a/terraform/examples/multicloud_tworegion_provisionmode/edge/versions.tf +++ b/terraform/examples/multicloud_tworegion_provisionmode/edge/versions.tf @@ -5,6 +5,7 @@ terraform { } azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { source = "aristanetworks/cloudeos" diff --git a/terraform/examples/multicloud_tworegion_provisionmode/topology/versions.tf b/terraform/examples/multicloud_tworegion_provisionmode/topology/versions.tf index 7457815..0c63c70 100644 --- a/terraform/examples/multicloud_tworegion_provisionmode/topology/versions.tf +++ b/terraform/examples/multicloud_tworegion_provisionmode/topology/versions.tf @@ -3,7 +3,10 @@ terraform { aws = { source = "hashicorp/aws" } - + azurerm = { + source = "hashicorp/azurerm" + version = "~> 2.0" + } cloudeos = { source = "aristanetworks/cloudeos" version = ">= 1.1.3" diff --git a/terraform/module/cloudeos/azure/rg-static/versions.tf b/terraform/module/cloudeos/azure/rg-static/versions.tf index de35e2a..74934d0 100644 --- a/terraform/module/cloudeos/azure/rg-static/versions.tf +++ b/terraform/module/cloudeos/azure/rg-static/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { diff --git a/terraform/module/cloudeos/azure/rg/versions.tf b/terraform/module/cloudeos/azure/rg/versions.tf index de35e2a..74934d0 100644 --- a/terraform/module/cloudeos/azure/rg/versions.tf +++ b/terraform/module/cloudeos/azure/rg/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { diff --git a/terraform/module/cloudeos/azure/router/versions.tf b/terraform/module/cloudeos/azure/router/versions.tf index de35e2a..74934d0 100644 --- a/terraform/module/cloudeos/azure/router/versions.tf +++ b/terraform/module/cloudeos/azure/router/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { diff --git a/terraform/module/cloudeos/azure/subnet-static/versions.tf b/terraform/module/cloudeos/azure/subnet-static/versions.tf index de35e2a..74934d0 100644 --- a/terraform/module/cloudeos/azure/subnet-static/versions.tf +++ b/terraform/module/cloudeos/azure/subnet-static/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = { diff --git a/terraform/module/cloudeos/azure/subnet/versions.tf b/terraform/module/cloudeos/azure/subnet/versions.tf index de35e2a..74934d0 100644 --- a/terraform/module/cloudeos/azure/subnet/versions.tf +++ b/terraform/module/cloudeos/azure/subnet/versions.tf @@ -2,6 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" + version = "~> 2.0" } cloudeos = {