diff --git a/modules/common/outputs.tf b/modules/common/outputs.tf index 1d4ad2b..462f5a6 100755 --- a/modules/common/outputs.tf +++ b/modules/common/outputs.tf @@ -30,8 +30,8 @@ output "template_name"{ value = var.template_name } -output "template_version" { - value = var.template_version +output "module_version" { + value = var.module_version } output "bootstrap_script"{ diff --git a/modules/common/variables.tf b/modules/common/variables.tf index 7394419..16b308e 100755 --- a/modules/common/variables.tf +++ b/modules/common/variables.tf @@ -118,7 +118,7 @@ variable "template_name"{ type = string } -variable "template_version"{ +variable "module_version"{ description = "Template name. Should be defined according to deployment type(e.g. ha, vmss)" type = string } diff --git a/modules/management_new_vnet/README.md b/modules/management_new_vnet/README.md index fa8ab42..1197840 100755 --- a/modules/management_new_vnet/README.md +++ b/modules/management_new_vnet/README.md @@ -26,7 +26,8 @@ provider "azurerm" { module "example_module" { source = "CheckPointSW/cloudguard-network-security/azure//modules/management_new_vnet" - version = "1.0.2" + version = "1.0.3" + source_image_vhd_uri = "noCustomUri" resource_group_name = "checkpoint-mgmt-terraform" diff --git a/modules/management_new_vnet/cloud-init.sh b/modules/management_new_vnet/cloud-init.sh index 4639554..58fd101 100755 --- a/modules/management_new_vnet/cloud-init.sh +++ b/modules/management_new_vnet/cloud-init.sh @@ -4,7 +4,7 @@ installationType="${installation_type}" allowUploadDownload="${allow_upload_download}" osVersion="${os_version}" templateName="${template_name}" -templateVersion="${template_version}" +templateVersion="${module_version}" templateType="${template_type}" isBlink="${is_blink}" bootstrapScript64="${bootstrap_script64}" diff --git a/modules/management_new_vnet/locals.tf b/modules/management_new_vnet/locals.tf index d117cee..7130e3a 100755 --- a/modules/management_new_vnet/locals.tf +++ b/modules/management_new_vnet/locals.tf @@ -1,4 +1,4 @@ locals { template_name = "mgmt_terraform_registry" - version = "1.0.2" + module_version = "1.0.3" } diff --git a/modules/management_new_vnet/main.tf b/modules/management_new_vnet/main.tf index fb8cf55..40f4883 100755 --- a/modules/management_new_vnet/main.tf +++ b/modules/management_new_vnet/main.tf @@ -6,7 +6,7 @@ module "common" { admin_password = var.admin_password installation_type = var.installation_type template_name = local.template_name - template_version = local.template_version + module_version = local.module_version number_of_vm_instances = 1 allow_upload_download = var.allow_upload_download vm_size = var.vm_size @@ -263,7 +263,7 @@ resource "azurerm_virtual_machine" "mgmt-vm-instance" { allow_upload_download = module.common.allow_upload_download os_version = module.common.os_version template_name = module.common.template_name - template_version = module.common.template_version + module_version = module.common.module_version template_type = "terraform" is_blink = module.common.is_blink bootstrap_script64 = base64encode(var.bootstrap_script) diff --git a/modules/single_gateway_new_vnet/README.md b/modules/single_gateway_new_vnet/README.md index c6e6d7e..a05c437 100755 --- a/modules/single_gateway_new_vnet/README.md +++ b/modules/single_gateway_new_vnet/README.md @@ -25,7 +25,7 @@ provider "azurerm" { module "example_module" { source = "CheckPointSW/cloudguard-network-security/azure//modules/single_gateway_new_vnet" - version = "1.0.2" + version = "1.0.3" source_image_vhd_uri = "noCustomUri" resource_group_name = "checkpoint-single-gw-terraform" diff --git a/modules/single_gateway_new_vnet/cloud-init.sh b/modules/single_gateway_new_vnet/cloud-init.sh index 71bf391..a2d209c 100755 --- a/modules/single_gateway_new_vnet/cloud-init.sh +++ b/modules/single_gateway_new_vnet/cloud-init.sh @@ -4,7 +4,7 @@ installationType="${installation_type}" allowUploadDownload="${allow_upload_download}" osVersion="${os_version}" templateName="${template_name}" -templateVersion="${template_version}" +templateVersion="${module_version}" templateType="${template_type}" isBlink="${is_blink}" bootstrapScript64="${bootstrap_script64}" diff --git a/modules/single_gateway_new_vnet/locals.tf b/modules/single_gateway_new_vnet/locals.tf index 7a54851..9892b55 100755 --- a/modules/single_gateway_new_vnet/locals.tf +++ b/modules/single_gateway_new_vnet/locals.tf @@ -1,4 +1,4 @@ locals { template_name = "single_terraform_registry" - version = "1.0.2" + module_version = "1.0.3" } diff --git a/modules/single_gateway_new_vnet/main.tf b/modules/single_gateway_new_vnet/main.tf index 138a8e6..748f740 100755 --- a/modules/single_gateway_new_vnet/main.tf +++ b/modules/single_gateway_new_vnet/main.tf @@ -6,7 +6,7 @@ module "common" { admin_password = var.admin_password installation_type = var.installation_type template_name = local.template_name - template_version = local.version + module_version = local.module_version number_of_vm_instances = 1 allow_upload_download = var.allow_upload_download vm_size = var.vm_size @@ -188,7 +188,7 @@ resource "azurerm_virtual_machine" "single-gateway-vm-instance" { allow_upload_download = module.common.allow_upload_download os_version = module.common.os_version template_name = module.common.template_name - template_version = module.common.template_version + module_version = module.common.module_version template_type = "terraform" is_blink = module.common.is_blink bootstrap_script64 = base64encode(var.bootstrap_script) diff --git a/modules/vmss_new_vnet/README.md b/modules/vmss_new_vnet/README.md index 30440ea..d203010 100755 --- a/modules/vmss_new_vnet/README.md +++ b/modules/vmss_new_vnet/README.md @@ -29,7 +29,7 @@ provider "azurerm" { module "example_module" { source = "CheckPointSW/cloudguard-network-security/azure//modules/vmss_new_vnet" - version = "1.0.2" + version = "1.0.3" subscription_id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" source_image_vhd_uri = "noCustomUri" diff --git a/modules/vmss_new_vnet/cloud-init.sh b/modules/vmss_new_vnet/cloud-init.sh index f11f72c..f595e2b 100755 --- a/modules/vmss_new_vnet/cloud-init.sh +++ b/modules/vmss_new_vnet/cloud-init.sh @@ -4,7 +4,7 @@ installationType="${installation_type}" allowUploadDownload="${allow_upload_download}" osVersion="${os_version}" templateName="${template_name}" -templateVersion="${template_version}" +templateVersion="${module_version}" templateType="${template_type}" isBlink="${is_blink}" bootstrapScript64="${bootstrap_script64}" diff --git a/modules/vmss_new_vnet/locals.tf b/modules/vmss_new_vnet/locals.tf index d05c8e9..c309b21 100755 --- a/modules/vmss_new_vnet/locals.tf +++ b/modules/vmss_new_vnet/locals.tf @@ -1,4 +1,4 @@ locals { template_name = "vmss_terraform_registry" - version = "1.0.2" + module_version = "1.0.3" } diff --git a/modules/vmss_new_vnet/main.tf b/modules/vmss_new_vnet/main.tf index 911daa2..881a33b 100755 --- a/modules/vmss_new_vnet/main.tf +++ b/modules/vmss_new_vnet/main.tf @@ -6,7 +6,7 @@ module "common" { admin_password = var.authentication_type == "SSH Public Key" ? random_id.random_id.hex : var.admin_password installation_type = var.installation_type template_name = local.template_name - template_version = local.template_version + module_version = local.module_version number_of_vm_instances = var.number_of_vm_instances allow_upload_download = var.allow_upload_download vm_size = var.vm_size @@ -257,7 +257,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vmss" { allow_upload_download = module.common.allow_upload_download os_version = module.common.os_version template_name = module.common.template_name - template_version = module.common.template_version + module_version = module.common.module_version template_type = "terraform" is_blink = module.common.is_blink bootstrap_script64 = base64encode(var.bootstrap_script)