From 39330e10ee263343df391345369d006dd19c94f4 Mon Sep 17 00:00:00 2001 From: Ay1man2 Date: Fri, 24 May 2024 11:11:59 -0700 Subject: [PATCH] Issue 1944: Updated deprecated AIX Stock Images in templates (#1945) * updated all templates to remove deprecated images, replaced depracted AIX images * update changelog + prettier formatting * added missing VSI images, removed depends on from networks for oracle-rac, updated AIX images to latest version --- CHANGELOG.md | 1 + client/src/lib/docs/release-notes.json | 3 +- client/src/lib/docs/templates/oracle-rac.json | 86 +++++++++++++------ client/src/lib/docs/templates/oracle-si.json | 51 ++++++++--- .../docs/templates/power-poc-quick-start.json | 20 ++--- .../lib/docs/templates/power-sap-hana.json | 67 ++------------- .../lib/docs/templates/quick-start-power.json | 36 ++++++-- .../lib/docs/templates/vpn-as-a-service.json | 34 ++++++-- 8 files changed, 174 insertions(+), 124 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aafcaf9..fea4b1dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. ### Upgrade Notes - Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan +- Updated AIX stock images and removed deprecated images for all templates with invalid image references ### Features diff --git a/client/src/lib/docs/release-notes.json b/client/src/lib/docs/release-notes.json index c3c2f38a..ff4df754 100644 --- a/client/src/lib/docs/release-notes.json +++ b/client/src/lib/docs/release-notes.json @@ -14,7 +14,8 @@ "Power VS Images are now reset when changing zones or changing the name of an existing workspace" ], "upgrade_notes": [ - "Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan" + "Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan", + "Updated AIX stock images and removed deprecated images for all templates with invalid image references" ] }, { diff --git a/client/src/lib/docs/templates/oracle-rac.json b/client/src/lib/docs/templates/oracle-rac.json index 3f9e00dc..de55f397 100644 --- a/client/src/lib/docs/templates/oracle-rac.json +++ b/client/src/lib/docs/templates/oracle-rac.json @@ -11,12 +11,13 @@ "dynamic_subnets": false, "enable_power_vs": true, "power_vs_zones": ["dal12", "dal10", "us-south"], - "craig_version": "1.10.0", + "craig_version": "1.15.6", "power_vs_high_availability": false, "no_vpn_secrets_manager_auth": false, "power_vs_ha_zone_1": null, "power_vs_ha_zone_2": null, - "manual_power_vsi_naming": false + "manual_power_vsi_naming": false, + "template": "Power VS Oracle Ready" }, "access_groups": [], "appid": [], @@ -36,12 +37,19 @@ }, "cbr_rules": [], "cbr_zones": [], + "cis": [], + "cis_glbs": [], + "classic_bare_metal": [], + "classic_gateways": [], + "classic_security_groups": [], "classic_ssh_keys": [], "classic_vlans": [], + "classic_vsi": [], "clusters": [], "dns": [], "event_streams": [], "f5_vsi": [], + "fortigate_vnf": [], "iam_account_settings": { "enable": false, "mfa": null, @@ -250,15 +258,15 @@ "cloud_connections": [], "images": [ { - "name": "7300-00-01", + "name": "7300-02-01", "workspace": "oracle-template", "zone": "dal12", - "pi_image_id": "2cf98f53-433d-4c7a-bc46-1f2dfcc04066", + "pi_image_id": "dd13124c-1212-4b25-a2aa-17dabc040eaa", "workspace_use_data": false } ], "attachments": [], - "imageNames": ["7300-00-01"], + "imageNames": ["7300-02-01"], "use_data": false } ], @@ -266,7 +274,7 @@ { "name": "oracle-1", "workspace": "oracle-template", - "image": "7300-00-01", + "image": "7300-02-01", "network": [ { "name": "oracle-private-1", @@ -306,12 +314,13 @@ "pi_ibmi_rds_users": null, "pi_user_data": null, "pi_pin_policy": "none", - "pi_license_repository_capacity": null + "pi_license_repository_capacity": null, + "index": 0 }, { "name": "oracle-2", "workspace": "oracle-template", - "image": "7300-00-01", + "image": "7300-02-01", "network": [ { "name": "oracle-private-1", @@ -351,7 +360,8 @@ "pi_ibmi_rds_users": null, "pi_user_data": null, "pi_pin_policy": "none", - "pi_license_repository_capacity": null + "pi_license_repository_capacity": null, + "index": 1 } ], "power_volumes": [ @@ -373,7 +383,8 @@ "pi_affinity_instance": "oracle-1", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 0 }, { "name": "oracle-1-db-2", @@ -393,7 +404,8 @@ "pi_affinity_instance": "oracle-1", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 1 }, { "name": "oracle-2-db-1", @@ -413,7 +425,8 @@ "pi_affinity_instance": "oracle-2", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 2 }, { "name": "oracle-2-db-2", @@ -433,7 +446,8 @@ "pi_affinity_instance": "oracle-2", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 3 }, { "name": "redo-1", @@ -452,7 +466,8 @@ "pi_affinity_instance": null, "pi_anti_affinity_volume": null, "pi_anti_affinity_instance": null, - "count": null + "count": null, + "index": 4 }, { "name": "redo-2", @@ -471,7 +486,8 @@ "pi_affinity_instance": null, "pi_anti_affinity_volume": null, "pi_anti_affinity_instance": null, - "count": null + "count": null, + "index": 5 }, { "name": "asm-data-1", @@ -491,7 +507,8 @@ "pi_anti_affinity_volume": null, "pi_anti_affinity_instance": null, "pi_volume_pool": null, - "count": null + "count": null, + "index": 6 }, { "name": "asm-data-2", @@ -510,7 +527,8 @@ "pi_affinity_instance": null, "pi_anti_affinity_volume": null, "pi_anti_affinity_instance": null, - "count": null + "count": null, + "index": 7 }, { "name": "management", @@ -529,7 +547,8 @@ "pi_affinity_instance": null, "pi_anti_affinity_volume": null, "pi_anti_affinity_instance": null, - "count": null + "count": null, + "index": 8 }, { "name": "vote-1", @@ -549,7 +568,8 @@ "pi_affinity_instance": "oracle-1", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 9 }, { "name": "vote-2", @@ -569,7 +589,8 @@ "pi_affinity_instance": "oracle-1", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 10 }, { "name": "vote-3", @@ -589,7 +610,8 @@ "pi_affinity_instance": "oracle-1", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 11 } ], "resource_groups": [ @@ -626,6 +648,17 @@ "scope_description": null, "enable": false }, + "scc_v2": { + "enable": false, + "resource_group": null, + "region": null, + "account_id": "${var.account_id}", + "profile_attachments": [], + "name": null, + "use_cos": false, + "cos": null, + "bucket": null + }, "secrets_manager": [], "security_groups": [ { @@ -1720,7 +1753,7 @@ { "kms": "kms", "encryption_key": "vsi-volume-key", - "image": "ibm-ubuntu-22-04-1-minimal-amd64-1", + "image": "ibm-ubuntu-22-04-4-minimal-amd64-1", "profile": "cx2-4x8", "name": "management-server", "security_groups": ["management-vsi"], @@ -1733,7 +1766,7 @@ "user_data": null, "network_interfaces": [], "volumes": [], - "image_name": null, + "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]", "enable_floating_ip": false, "primary_interface_ip_spoofing": false, "use_variable_names": false, @@ -1749,8 +1782,7 @@ { "kms": "kms", "encryption_key": "vsi-volume-key", - "image": "ibm-ubuntu-22-04-3-minimal-amd64-1", - "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-3-minimal-amd64-1]", + "image": "ibm-ubuntu-22-04-4-minimal-amd64-1", "profile": "bx2-2x8", "name": "workload-server", "security_groups": ["workload-vpe"], @@ -1763,6 +1795,7 @@ "network_interfaces": [], "subnets": ["vsi-zone-1", "vsi-zone-2", "vsi-zone-3"], "volumes": [], + "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]", "subnet": "", "enable_floating_ip": false, "primary_interface_ip_spoofing": false, @@ -1772,5 +1805,6 @@ "reserved_ips": [[""], [""], [""]], "enable_static_ips": false } - ] + ], + "vtl": [] } diff --git a/client/src/lib/docs/templates/oracle-si.json b/client/src/lib/docs/templates/oracle-si.json index 895e3e8a..5912f081 100644 --- a/client/src/lib/docs/templates/oracle-si.json +++ b/client/src/lib/docs/templates/oracle-si.json @@ -10,13 +10,14 @@ "dynamic_subnets": false, "enable_power_vs": true, "power_vs_zones": ["dal12", "dal10", "us-south"], - "craig_version": "1.12.0", + "craig_version": "1.15.6", "power_vs_high_availability": false, "no_vpn_secrets_manager_auth": false, "enable_classic": false, "power_vs_ha_zone_1": null, "power_vs_ha_zone_2": null, - "manual_power_vsi_naming": false + "manual_power_vsi_naming": false, + "template": "Power VS Oracle Single Instance" }, "access_groups": [], "appid": [], @@ -36,12 +37,19 @@ }, "cbr_rules": [], "cbr_zones": [], + "cis": [], + "cis_glbs": [], + "classic_bare_metal": [], + "classic_gateways": [], + "classic_security_groups": [], "classic_ssh_keys": [], "classic_vlans": [], + "classic_vsi": [], "clusters": [], "dns": [], "event_streams": [], "f5_vsi": [], + "fortigate_vnf": [], "iam_account_settings": { "enable": false, "mfa": null, @@ -226,15 +234,15 @@ "cloud_connections": [], "images": [ { - "name": "7300-00-01", + "name": "7300-02-01", "workspace": "oracle-template", "zone": "dal12", - "pi_image_id": "2cf98f53-433d-4c7a-bc46-1f2dfcc04066", + "pi_image_id": "dd13124c-1212-4b25-a2aa-17dabc040eaa", "workspace_use_data": false } ], "attachments": [], - "imageNames": ["7300-00-01"], + "imageNames": ["7300-02-01"], "use_data": false } ], @@ -242,7 +250,7 @@ { "name": "oracle", "workspace": "oracle-template", - "image": "7300-00-01", + "image": "7300-02-01", "network": [ { "name": "oracle-vlan", @@ -274,7 +282,8 @@ "pi_ibmi_rds_users": null, "pi_user_data": null, "pi_pin_policy": "none", - "pi_license_repository_capacity": null + "pi_license_repository_capacity": null, + "index": 0 } ], "power_volumes": [ @@ -296,7 +305,8 @@ "pi_affinity_instance": "oracle", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 0 }, { "name": "oracle-db-2", @@ -316,7 +326,8 @@ "pi_affinity_instance": "oracle", "pi_volume_pool": null, "pi_affinity_volume": null, - "count": null + "count": null, + "index": 1 } ], "resource_groups": [ @@ -353,6 +364,17 @@ "scope_description": null, "enable": false }, + "scc_v2": { + "enable": false, + "resource_group": null, + "region": null, + "account_id": "${var.account_id}", + "profile_attachments": [], + "name": null, + "use_cos": false, + "cos": null, + "bucket": null + }, "secrets_manager": [], "security_groups": [ { @@ -1447,7 +1469,7 @@ { "kms": "kms", "encryption_key": "vsi-volume-key", - "image": "ibm-ubuntu-22-04-1-minimal-amd64-1", + "image": "ibm-ubuntu-22-04-4-minimal-amd64-1", "profile": "cx2-4x8", "name": "management-server", "security_groups": ["management-vsi"], @@ -1460,7 +1482,7 @@ "user_data": null, "network_interfaces": [], "volumes": [], - "image_name": null, + "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]", "enable_floating_ip": false, "primary_interface_ip_spoofing": false, "use_variable_names": false, @@ -1476,8 +1498,7 @@ { "kms": "kms", "encryption_key": "vsi-volume-key", - "image": "ibm-ubuntu-22-04-3-minimal-amd64-1", - "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-3-minimal-amd64-1]", + "image": "ibm-ubuntu-22-04-4-minimal-amd64-1", "profile": "bx2-2x8", "name": "workload-server", "security_groups": ["workload-vpe"], @@ -1490,6 +1511,7 @@ "network_interfaces": [], "subnets": ["vsi-zone-1", "vsi-zone-2", "vsi-zone-3"], "volumes": [], + "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]", "subnet": "", "enable_floating_ip": false, "primary_interface_ip_spoofing": false, @@ -1499,5 +1521,6 @@ "reserved_ips": [[""], [""], [""]], "enable_static_ips": false } - ] + ], + "vtl": [] } diff --git a/client/src/lib/docs/templates/power-poc-quick-start.json b/client/src/lib/docs/templates/power-poc-quick-start.json index 4d3d4edf..5aed9a8f 100644 --- a/client/src/lib/docs/templates/power-poc-quick-start.json +++ b/client/src/lib/docs/templates/power-poc-quick-start.json @@ -10,7 +10,7 @@ "enable_power_vs": true, "enable_classic": false, "power_vs_zones": ["dal10"], - "craig_version": "1.14.1", + "craig_version": "1.15.6", "power_vs_high_availability": false, "template": "Power VS POC", "fs_cloud": false, @@ -223,12 +223,12 @@ "cloud_connections": [], "images": [ { - "creationDate": "2023-03-07T11:21:01.000Z", + "creationDate": "2024-03-20T19:06:59.000Z", "description": "", - "href": "/pcloud/v1/cloud-instances/d839ff9f75e2465a81707aa69ee9a9b7/stock-images/142d55ca-d24c-4114-a2f9-4174e96ed96e", - "imageID": "142d55ca-d24c-4114-a2f9-4174e96ed96e", - "lastUpdateDate": "2023-03-14T16:27:52.000Z", - "name": "7300-01-01", + "href": "/pcloud/v1/cloud-instances/d839ff9f75e2465a81707aa69ee9a9b7/stock-images/f557c9a5-c5e4-4b96-9e30-4e9589e9fad8", + "imageID": "f557c9a5-c5e4-4b96-9e30-4e9589e9fad8", + "lastUpdateDate": "2024-03-20T19:50:48.000Z", + "name": "7300-02-01", "specifications": { "architecture": "ppc64", "containerFormat": "bare", @@ -239,7 +239,7 @@ "operatingSystem": "aix" }, "state": "active", - "storagePool": "Tier3-Flash-1", + "storagePool": "General-Flash-50", "storageType": "tier3", "workspace": "dal10", "zone": "dal10", @@ -267,11 +267,11 @@ "workspace": "dal10", "zone": "dal10", "workspace_use_data": false, - "depends_on": ["${ibm_pi_image.power_image_dal10_7300_01_01}"] + "depends_on": ["${ibm_pi_image.power_image_dal10_7300_02_01}"] } ], "attachments": [], - "imageNames": ["7300-01-01", "IBMi-75-03-2984-1"], + "imageNames": ["7300-02-01", "IBMi-75-03-2984-1"], "use_data": false } ], @@ -279,7 +279,7 @@ { "name": "aixtarget", "workspace": "dal10", - "image": "7300-01-01", + "image": "7300-02-01", "network": [ { "name": "pvm", diff --git a/client/src/lib/docs/templates/power-sap-hana.json b/client/src/lib/docs/templates/power-sap-hana.json index 4fe1b58a..45279e1f 100644 --- a/client/src/lib/docs/templates/power-sap-hana.json +++ b/client/src/lib/docs/templates/power-sap-hana.json @@ -11,7 +11,7 @@ "dynamic_subnets": false, "enable_power_vs": true, "power_vs_zones": ["dal10"], - "craig_version": "1.12.0", + "craig_version": "1.15.6", "power_vs_high_availability": false, "template": "Power VS SAP Hana", "no_vpn_secrets_manager_auth": false, @@ -52,9 +52,12 @@ "cbr_zones": [], "cis": [], "cis_glbs": [], + "classic_bare_metal": [], "classic_gateways": [], + "classic_security_groups": [], "classic_ssh_keys": [], "classic_vlans": [], + "classic_vsi": [], "clusters": [], "dns": [], "event_streams": [], @@ -280,53 +283,6 @@ ], "cloud_connections": [], "images": [ - { - "creationDate": "2023-02-14T18:39:48.000Z", - "description": "", - "href": "/pcloud/v1/cloud-instances/d839ff9f75e2465a81707aa69ee9a9b7/stock-images/a857bbbd-6fee-4bf7-816d-04fb4cdbf65e", - "imageID": "a857bbbd-6fee-4bf7-816d-04fb4cdbf65e", - "lastUpdateDate": "2023-02-14T22:29:20.000Z", - "name": "7100-05-09", - "specifications": { - "architecture": "ppc64", - "containerFormat": "bare", - "diskFormat": "raw", - "endianness": "big-endian", - "hypervisorType": "phyp", - "operatingSystem": "aix" - }, - "state": "active", - "storagePool": "Tier3-Flash-1", - "storageType": "tier3", - "workspace": "secure-powervs", - "zone": "dal10", - "workspace_use_data": false - }, - { - "creationDate": "2023-09-16T18:38:33.000Z", - "description": "", - "href": "/pcloud/v1/cloud-instances/d839ff9f75e2465a81707aa69ee9a9b7/stock-images/69866375-0cec-4db9-93e9-a55c63c13d6e", - "imageID": "69866375-0cec-4db9-93e9-a55c63c13d6e", - "lastUpdateDate": "2023-09-16T21:38:22.000Z", - "name": "IBMi-71-11-2924-8", - "specifications": { - "architecture": "ppc64", - "containerFormat": "bare", - "diskFormat": "raw", - "endianness": "big-endian", - "hypervisorType": "phyp", - "operatingSystem": "ibmi" - }, - "state": "active", - "storagePool": "Tier3-Flash-1", - "storageType": "tier3", - "workspace": "secure-powervs", - "zone": "dal10", - "workspace_use_data": false, - "depends_on": [ - "${ibm_pi_image.power_image_secure_powervs_7100_05_09}" - ] - }, { "creationDate": "2024-01-30T12:46:02.000Z", "description": "", @@ -348,10 +304,7 @@ "storageType": "tier3", "workspace": "secure-powervs", "zone": "dal10", - "workspace_use_data": false, - "depends_on": [ - "${ibm_pi_image.power_image_secure_powervs_ibmi_71_11_2924_8}" - ] + "workspace_use_data": false }, { "creationDate": "2024-01-30T14:31:23.000Z", @@ -926,8 +879,6 @@ ], "attachments": [], "imageNames": [ - "7100-05-09", - "IBMi-71-11-2924-8", "RHEL8-SP4-SAP-BYOL", "RHEL8-SP4-SAP-NETWEAVER-BYOL", "RHEL8-SP6", @@ -2776,8 +2727,8 @@ "code": null }, "tcp": { - "port_min": "22", - "port_max": "22", + "port_min": 22, + "port_max": 22, "source_port_min": null, "source_port_max": null }, @@ -2810,8 +2761,8 @@ "tcp": { "port_min": null, "port_max": null, - "source_port_min": "22", - "source_port_max": "22" + "source_port_min": 22, + "source_port_max": 22 }, "udp": { "port_min": null, diff --git a/client/src/lib/docs/templates/quick-start-power.json b/client/src/lib/docs/templates/quick-start-power.json index 4b6f3f55..82ab6511 100644 --- a/client/src/lib/docs/templates/quick-start-power.json +++ b/client/src/lib/docs/templates/quick-start-power.json @@ -10,13 +10,14 @@ "enable_power_vs": true, "enable_classic": false, "power_vs_zones": ["dal12"], - "craig_version": "1.12.0", + "craig_version": "1.15.6", "power_vs_high_availability": false, "fs_cloud": false, "no_vpn_secrets_manager_auth": false, "power_vs_ha_zone_1": null, "power_vs_ha_zone_2": null, - "manual_power_vsi_naming": false + "manual_power_vsi_naming": false, + "template": "Power VS Quick Start" }, "access_groups": [], "appid": [], @@ -36,12 +37,19 @@ }, "cbr_rules": [], "cbr_zones": [], + "cis": [], + "cis_glbs": [], + "classic_bare_metal": [], + "classic_gateways": [], + "classic_security_groups": [], "classic_ssh_keys": [], "classic_vlans": [], + "classic_vsi": [], "clusters": [], "dns": [], "event_streams": [], "f5_vsi": [], + "fortigate_vnf": [], "iam_account_settings": { "enable": false, "mfa": null, @@ -169,15 +177,15 @@ "cloud_connections": [], "images": [ { - "name": "7100-05-09", + "name": "7300-02-01", "workspace": "workspace", "zone": "dal12", - "pi_image_id": "35eca797-6599-4597-af1f-d2eb5e292dfc", + "pi_image_id": "dd13124c-1212-4b25-a2aa-17dabc040eaa", "workspace_use_data": false } ], "attachments": [], - "imageNames": ["7100-05-09"], + "imageNames": ["7300-02-01"], "use_data": false } ], @@ -207,6 +215,17 @@ "scope_description": null, "enable": false }, + "scc_v2": { + "enable": false, + "resource_group": null, + "region": null, + "account_id": "${var.account_id}", + "profile_attachments": [], + "name": null, + "use_cos": false, + "cos": null, + "bucket": null + }, "secrets_manager": [], "security_groups": [ { @@ -795,8 +814,8 @@ { "kms": "kms", "encryption_key": "key", - "image": "ibm-redhat-9-2-minimal-amd64-1", - "image_name": "Red Hat Enterprise Linux 9.x - Minimal Install (amd64) [ibm-redhat-9-2-minimal-amd64-1]", + "image": "ibm-redhat-9-4-minimal-amd64-1", + "image_name": "Red Hat Enterprise Linux 9.x - Minimal Install (amd64) [ibm-redhat-9-4-minimal-amd64-1]", "profile": "bx2-4x16", "name": "example-deployment", "security_groups": ["management-vsi"], @@ -818,5 +837,6 @@ "reserved_ips": [[""]], "enable_static_ips": false } - ] + ], + "vtl": [] } diff --git a/client/src/lib/docs/templates/vpn-as-a-service.json b/client/src/lib/docs/templates/vpn-as-a-service.json index 48e4f9c3..673f65c1 100644 --- a/client/src/lib/docs/templates/vpn-as-a-service.json +++ b/client/src/lib/docs/templates/vpn-as-a-service.json @@ -9,15 +9,16 @@ "fs_cloud": false, "dynamic_subnets": false, "enable_power_vs": true, - "craig_version": "1.12.0", "power_vs_zones": ["dal12", "dal10", "us-south"], + "craig_version": "1.15.6", "advanced_subnets": true, "power_vs_high_availability": false, "no_vpn_secrets_manager_auth": false, "enable_classic": false, "power_vs_ha_zone_1": null, "power_vs_ha_zone_2": null, - "manual_power_vsi_naming": false + "manual_power_vsi_naming": false, + "template": "VPN as a Service" }, "access_groups": [], "appid": [], @@ -37,12 +38,19 @@ }, "cbr_rules": [], "cbr_zones": [], + "cis": [], + "cis_glbs": [], + "classic_bare_metal": [], + "classic_gateways": [], + "classic_security_groups": [], "classic_ssh_keys": [], "classic_vlans": [], + "classic_vsi": [], "clusters": [], "dns": [], "event_streams": [], "f5_vsi": [], + "fortigate_vnf": [], "iam_account_settings": { "enable": false, "mfa": null, @@ -127,15 +135,15 @@ "cloud_connections": [], "images": [ { - "name": "7200-05-03", + "name": "7300-02-01", "workspace": "vpnaas", "zone": "dal12", - "pi_image_id": "ab5777c4-60ef-45a1-90aa-4a144dbe3104", + "pi_image_id": "dd13124c-1212-4b25-a2aa-17dabc040eaa", "workspace_use_data": false } ], "attachments": [], - "imageNames": ["7200-05-03"], + "imageNames": ["7300-02-01"], "use_data": false } ], @@ -187,6 +195,17 @@ "scope_description": null, "enable": false }, + "scc_v2": { + "enable": false, + "resource_group": null, + "region": null, + "account_id": "${var.account_id}", + "profile_attachments": [], + "name": null, + "use_cos": false, + "cos": null, + "bucket": null + }, "secrets_manager": [ { "name": "secrets-manager", @@ -509,7 +528,7 @@ "vpn_servers": [ { "name": "client-to-site", - "certificate_crn": "", + "certificate_crn": null, "method": "INSECURE", "client_ca_crn": null, "client_ip_pool": "192.168.8.0/22", @@ -534,5 +553,6 @@ "secrets_manager": "secrets-manager" } ], - "vsi": [] + "vsi": [], + "vtl": [] }