Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to FortiOS v7.6.1B3457 #40

Merged
merged 2 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions instance.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ data "ibm_is_ssh_key" "ssh_key" {
name = var.SSH_PUBLIC_KEY
}

// HA Password
resource "random_string" "ha_password" {
length = 8
special = false
}

resource "ibm_is_volume" "logDisk1" {
// Name must be lower case
name = "${var.CLUSTER_NAME}-logdisk1-${random_string.random_suffix.result}"
Expand Down Expand Up @@ -173,6 +179,7 @@ data "template_file" "userdata_active" {
ibm_api_key = var.IBMCLOUD_API_KEY
region = var.IBMREGION[var.REGION]
fgt1_port_4_mgmt_gateway = var.FGT1_PORT4_MGMT_GATEWAY
ha_password = random_string.ha_password.result

}
}
Expand All @@ -195,5 +202,7 @@ data "template_file" "userdata_passive" {
ibm_api_key = var.IBMCLOUD_API_KEY
region = var.IBMREGION[var.REGION]
fgt2_port_4_mgmt_gateway = var.FGT2_PORT4_MGMT_GATEWAY
ha_password = random_string.ha_password.result

}
}
2 changes: 1 addition & 1 deletion user_data_active.conf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ set mode a-p
set hbdev "port3" 100
set session-pickup enable
set ha-mgmt-status enable
set password ${ha_password}
config ha-mgmt-interfaces
edit 1
set interface "port4"
Expand All @@ -50,7 +51,6 @@ set status enable
set ha-status enable
set type ibm
set api-key ${ibm_api_key}
set compute-generation 2
set ibm-region ${region}
set update-interval 60
next
Expand Down
2 changes: 1 addition & 1 deletion user_data_passive.conf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ set mode a-p
set hbdev "port3" 100
set session-pickup enable
set ha-mgmt-status enable
set password ${ha_password}
config ha-mgmt-interfaces
edit 1
set interface "port4"
Expand All @@ -50,7 +51,6 @@ set status enable
set ha-status enable
set type ibm
set api-key ${ibm_api_key}
set compute-generation 2
set ibm-region ${region}
set update-interval 60
next
Expand Down
6 changes: 3 additions & 3 deletions vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ resource "random_string" "random_suffix" {
}

// FortiOS Custom Image ID
// https://docs.fortinet.com/document/fortigate-public-cloud/7.0.0/ibm-cloud-administration-guide/324064/ha-for-fortigate-vm-on-ibm-cloud
//Deploys 7.6.0 Image
// https://docs.fortinet.com/document/fortigate-public-cloud/7.6.0/ibm-cloud-administration-guide/992669/deploying-fortigate-vm-on-ibm-cloud
// Deploys 7.6.1 image
variable "image" {
default = "cos://us-geo/fortinet/fortigate_byol_760_b3401_GA.qcow2"
default = "cos://us-geo/fortinet/fortigate_byol_761_b3457_GA.qcow2"
}

variable "IBMCLOUD_API_KEY" {
Expand Down