diff --git a/modules/nva_into_existing_hub/README.md b/modules/nva_into_existing_hub/README.md index 4087bf4..851d3df 100755 --- a/modules/nva_into_existing_hub/README.md +++ b/modules/nva_into_existing_hub/README.md @@ -76,8 +76,8 @@ module "example_module" { | **managed-app-name** | The name of the managed application that will be created | string | The name must begin with a letter or number, end with a letter, number or underscore, and may contain only letters, numbers, underscores, periods, or hyphens.
**Default:** "tf-vwan-managed-app-nva" | | **nva-name** | The name of the NVA that will be created | string | The name must begin with a letter or number, end with a letter, number or underscore, and may contain only letters, numbers, underscores, periods, or hyphens.
**Default:** "tf-vwan-nva" | | **nva-rg-name** | The name of the resource group that will contain the NVA | string | Resource group names only allow alphanumeric characters, periods, underscores, hyphens and parenthesis and cannot end in a period.
**Default:** "tf-vwan-nva-rg" | -| **os-version** | The GAIA os version | string | "R8110";
"R8120";
"R82".
**Default:** "R8120" | -| **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)";
"Full Package (NGTX + S1C)";
"Full Package Premium (NGTX + S1C++)".
**Default:** "Security Enforcement (NGTP)" | +| **os-version** | The GAIA os version | string | "R8110";
"R8120";
"R82";
**Default:** "R8120" | +| **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)";
"Full Package (NGTX and Smart1-Cloud)";
"Full Package Premium (NGTX and Smart1-Cloud Premium)".
**Default:** "Security Enforcement (NGTP)" | | **scale-unit** | The scale unit determines the size and number of resources deployed. The higher the scale unit, the greater the amount of traffic that can be handled | string | "2";
"4";
"10";
"20";
"30";
"60";
"80".
**Default:** "2" | | **bootstrap_script** | An optional script to run on the initial boot | string | Bootstrap script example:
"touch /home/admin/bootstrap.txt; echo 'hello_world' > /home/admin/bootstrap.txt".
The script will create bootstrap.txt file in the /home/admin/ and add 'hello word' string into it.
**Default:** "" | | **admin_shell** | Enables to select different admin shells | string | /etc/cli.sh;
/bin/bash;
/bin/csh;
/bin/tcsh.
**Default:** "/etc/cli.sh" | diff --git a/modules/nva_into_existing_hub/main.tf b/modules/nva_into_existing_hub/main.tf index 0d95a50..c0a8dfb 100755 --- a/modules/nva_into_existing_hub/main.tf +++ b/modules/nva_into_existing_hub/main.tf @@ -32,7 +32,7 @@ locals { data "http" "image-versions" { method = "GET" - url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX + S1C)" ? "-ngtx" : var.license-type == "Full Package Premium (NGTX + S1C++)" ? "-premium" : ""}?api-version=2020-05-01" + url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX and Smart1-Cloud)" ? "-ngtx" : var.license-type == "Full Package Premium (NGTX and Smart1-Cloud Premium)" ? "-premium" : ""}?api-version=2020-05-01" request_headers = { Accept = "application/json" "Authorization" = "Bearer ${local.access_token}" diff --git a/modules/nva_into_existing_hub/variables.tf b/modules/nva_into_existing_hub/variables.tf index 968e2f1..9cd334b 100755 --- a/modules/nva_into_existing_hub/variables.tf +++ b/modules/nva_into_existing_hub/variables.tf @@ -74,8 +74,8 @@ variable "license-type" { type = string default = "Security Enforcement (NGTP)" validation { - condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX + S1C)", "Full Package Premium (NGTX + S1C++)"], var.license-type) - error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)', 'Full Package (NGTX + S1C)', 'Full Package Premium (NGTX + S1C++)'" + condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX and Smart1-Cloud)", "Full Package Premium (NGTX and Smart1-Cloud Premium)"], var.license-type) + error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)', 'Full Package (NGTX and Smart1-Cloud)', 'Full Package Premium (NGTX and Smart1-Cloud Premium)'" } } diff --git a/modules/nva_into_new_vwan/README.md b/modules/nva_into_new_vwan/README.md index a4ac6ad..0c85292 100755 --- a/modules/nva_into_new_vwan/README.md +++ b/modules/nva_into_new_vwan/README.md @@ -82,8 +82,8 @@ module "example_module" { | **managed-app-name** | The name of the managed application that will be created | string | The name must begin with a letter or number, end with a letter, number or underscore, and may contain only letters, numbers, underscores, periods, or hyphens.
**Default:** tf-vwan-managed-app | | **nva-name** | The name of the NVA that will be created | string | The name must begin with a letter or number, end with a letter, number or underscore, and may contain only letters, numbers, underscores, periods, or hyphens.
**Default:** tf-vwan-nva | | **nva-rg-name** | The name of the resource group that will contain the NVA | string | Resource group names only allow alphanumeric characters, periods, underscores, hyphens and parenthesis and cannot end in a period.
**Default:** tf-vwan-nva-rg | -| **os-version** | The GAIA os version | string | "R8110";
"R8120";
"R82".
**Default:** "R8120" | -| **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)";
"Full Package (NGTX + S1C)";
"Full Package Premium (NGTX + S1C++)".
**Default:** "Security Enforcement (NGTP)" | +| **os-version** | The GAIA os version | string | "R8110";
"R8120";
"R82";
**Default:** "R8120" | +| **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)";
"Full Package (NGTX and Smart1-Cloud)";
"Full Package Premium (NGTX and Smart1-Cloud Premium)".
**Default:** "Security Enforcement (NGTP)" | | **scale-unit** | The scale unit determines the size and number of resources deployed. The higher the scale unit, the greater the amount of traffic that can be handled | string | "2";
"4";
"10";
"20";
"30";
"60";
"80".
**Default:** "2" | | **bootstrap_script** | An optional script to run on the initial boot | string | Bootstrap script example:
"touch /home/admin/bootstrap.txt; echo 'hello_world' > /home/admin/bootstrap.txt".
The script will create bootstrap.txt file in the /home/admin/ and add 'hello word' string into it.
**Default:** "" | | **admin_shell** | Enables to select different admin shells | string | /etc/cli.sh;
/bin/bash;
/bin/csh;
/bin/tcsh.
**Default:** "/etc/cli.sh" | diff --git a/modules/nva_into_new_vwan/main.tf b/modules/nva_into_new_vwan/main.tf index 968ae6b..d148e18 100755 --- a/modules/nva_into_new_vwan/main.tf +++ b/modules/nva_into_new_vwan/main.tf @@ -41,7 +41,7 @@ locals { data "http" "image-versions" { method = "GET" - url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX + S1C)" ? "-ngtx" : var.license-type == "Full Package Premium (NGTX + S1C++)" ? "-premium" : ""}?api-version=2020-05-01" + url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX and Smart1-Cloud)" ? "-ngtx" : var.license-type == "Full Package Premium (NGTX and Smart1-Cloud Premium)" ? "-premium" : ""}?api-version=2020-05-01" request_headers = { Accept = "application/json" "Authorization" = "Bearer ${local.access_token}" diff --git a/modules/nva_into_new_vwan/variables.tf b/modules/nva_into_new_vwan/variables.tf index b82996b..d2dca04 100755 --- a/modules/nva_into_new_vwan/variables.tf +++ b/modules/nva_into_new_vwan/variables.tf @@ -85,8 +85,8 @@ variable "license-type" { type = string default = "Security Enforcement (NGTP)" validation { - condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX + S1C)", "Full Package Premium (NGTX + S1C++)"], var.license-type) - error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)', 'Full Package (NGTX + S1C)', 'Full Package Premium (NGTX + S1C++)'" + condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX and Smart1-Cloud)", "Full Package Premium (NGTX and Smart1-Cloud Premium)"], var.license-type) + error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)', 'Full Package (NGTX and Smart1-Cloud)', 'Full Package Premium (NGTX and Smart1-Cloud Premium)'" } }